diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-15 01:28:37 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-15 09:29:07 +0000 |
| commit | f6dc74598b81f81122b9512330f684fddb5e761a (patch) | |
| tree | 2aad556cf0c16482f623aad1b4b51681e4539200 /Makefile.nmake | |
| parent | 58d00bad1a2c4298bd58013e4808899feb657422 (diff) | |
Add randpkt_core to the list of libraries for randpkt.
Also, get rid of the stuff for the extcap programs, as that's now
handled by extcap/Makefile.nmake.
Change-Id: Ide94c1cfc97d50e5d9fabbb923d9c52cccb62fa0
Reviewed-on: https://code.wireshark.org/review/13947
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b1fd6f504d..3926dfe267 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -68,9 +68,6 @@ dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) -# this does not work because source file is in a subfolder of this makefile -# and we end up recompiling systematically androiddump.c -#androiddump_OBJECTS = $(androiddump_SOURCES:.c=.obj) # # psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx @@ -177,22 +174,6 @@ text2pcap_LIBS= \ wsutil\libwsutil.lib \ $(GLIB_LIBS) -androiddump_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -sshdump_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - wsutil\libwsutil.lib \ - $(LIBSSH_LIBS) \ - -randpktdump_LIBS= randpkt_core\randpkt_core.lib \ - wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - dumpcap_LIBS= \ wsock32.lib user32.lib \ caputils\libcaputils.lib \ @@ -216,7 +197,8 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(SMI_LIBS) !ENDIF -randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ +randpkt_LIBS= randpkt_core\randpkt_core.lib \ + wiretap\wiretap-$(WTAP_VERSION).lib \ user32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) @@ -446,35 +428,6 @@ randpkt.exe : $(randpkt_OBJECTS) mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -androiddump.exe : $(LIBS_CHECK) config.h androiddump.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib - @echo Linking $@ - $(LINK) @<< - /OUT:androiddump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS androiddump.obj $(androiddump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "androiddump.exe.manifest" -outputresource:androiddump.exe;1 -!ENDIF - -randpktdump.exe : $(LIBS_CHECK) config.h randpktdump.obj randpkt_core\randpkt_core.lib wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib - @echo Linking $@ - $(LINK) @<< - /OUT:randpktdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS randpktdump.obj $(randpktdump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "randpktdump.exe.manifest" -outputresource:randpktdump.exe;1 -!ENDIF - -!IFDEF LIBSSH_DIR -sshdump.exe : $(LIBS_CHECK) config.h sshdump.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib - @echo Linking $@ - $(LINK) @<< - /OUT:sshdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS sshdump.obj $(sshdump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "sshdump.exe.manifest" -outputresource:sshdump.exe;1 -!ENDIF -!ENDIF - dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils wsutil\libwsutil.lib image\dumpcap.res @echo Linking $@ $(LINK) @<< |