diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-03-01 19:17:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-03-01 19:17:05 +0000 |
| commit | ceb816e721784986e0acbd56b6941dcfafb33192 (patch) | |
| tree | abd5ebda357fe6a727644a5ddead766284e57f34 /epan/Makefile.nmake | |
| parent | fb7dab8874ba33f3835ab2ac615977e5646d737f (diff) | |
Put the object file lists for various test programs into variables, and
use the variables, so the list of dependencies and the list of object
files used in the link command are the same (and so that they're
complete; the dependencies were, the link command lists weren't).
svn path=/trunk/; revision=32067
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 9e4f9988ba..af94e5b63c 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -67,8 +67,6 @@ EXTRA_OBJECTS = \ asm_utils.obj !ENDIF - - !IFDEF DOXYGEN DOXYGEN_DEP=doxygen !ENDIF @@ -222,30 +220,46 @@ exntest: exntest.exe reassemble_test: reassemble_test.exe tvbtest: tvbtest.exe +# Object files for exntest +EXNTEST_OBJ=exntest.obj except.obj - -exntest.exe: exntest.obj except.obj +exntest.exe: $(EXNTEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(GLIB_LIBS) exntest.obj except.obj + $(GLIB_LIBS) $(EXNTEST_OBJ) !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF -tvbtest.exe: tvbtest.obj tvbuff.obj except.obj to_str.obj strutil.obj emem.obj +# Object files for tvbtest +TVBTEST_OBJ=tvbtest.obj \ + tvbuff.obj \ + except.obj \ + to_str.obj \ + strutil.obj \ + emem.obj + +tvbtest.exe: $(TVBTEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(GLIB_LIBS) $(ZLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj + $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ) !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF -reassemble_test.exe: reassemble_test.obj tvbuff.obj except.obj to_str.obj strutil.obj emem.obj \ - reassemble.obj +# Object files for reassemble_test +REASSEMBLE_TEST_OBJ=reassemble_test.obj \ + tvbuff.obj \ + except.obj \ + to_str.obj \ + strutil.obj \ + emem.obj \ + reassemble.obj + +reassemble_test.exe: $(REASSEMBLE_TEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(GLIB_LIBS) $(ZLIB_LIBS) reassemble_test.obj tvbuff.obj \ - except.obj strutil.obj emem.obj reassemble.obj + $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ) !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF |