diff options
| -rw-r--r-- | Makefile.nmake | 9 | ||||
| -rw-r--r-- | extcap/Makefile.nmake | 6 | ||||
| -rw-r--r-- | writecap/Makefile.nmake | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 6aec541513..b38f0300b8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -413,7 +413,7 @@ reordercap.exe : $(LIBS_CHECK) config.h $(reordercap_OBJECTS) wsutil\libwsutil. mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 !ENDIF -text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap\libwritecap.lib wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res +text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res @echo Linking $@ $(LINK) @<< /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj $(text2pcap_LIBS) image\text2pcap.res @@ -440,7 +440,7 @@ randpkt.exe : $(randpkt_OBJECTS) randpkt_core mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils writecap\libwritecap.lib wsutil\libwsutil.lib image\dumpcap.res +dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils writecap wsutil\libwsutil.lib image\dumpcap.res @echo Linking $@ $(LINK) @<< /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(dumpcap_LIBS) $(dumpcap_OBJECTS) image\dumpcap.res @@ -809,6 +809,11 @@ caputils:: help config.h version.h doxygen $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcaputils.lib cd .. +writecap:: help config.h version.h doxygen + cd writecap + $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libwritecap.lib + cd .. + randpkt_core:: help config.h version.h doxygen cd randpkt_core $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake librandpkt_core.lib diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake index 57db68e8ff..22e27e9b8a 100644 --- a/extcap/Makefile.nmake +++ b/extcap/Makefile.nmake @@ -120,7 +120,7 @@ ciscodump.exe : $(LIBS_CHECK) ..\config.h ciscodump.obj extcap-base.obj ssh-base clean: rm -f $(androiddump_OBJECTS) $(randpktdump_OBJECTS) $(sshdump_OBJECTS) \ - ${ciscodump_OBJECTS} $(EXECUTABLES) *.nativecodeanalysis.xml *.pdb *.sbr \ + $(ciscodump_OBJECTS) $(EXECUTABLES) *.nativecodeanalysis.xml *.pdb *.sbr \ doxygen.cfg *.exe.manifest # "distclean" removes all files not part of the distribution. @@ -158,8 +158,8 @@ checkapi: checkapi-base checkapi-todo checkapi-base: $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ - $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) ${ciscodump_SOURCES} + $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) $(ciscodump_SOURCES) checkapi-todo: $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) ${ciscodump_SOURCES} + $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) $(ciscodump_SOURCES) diff --git a/writecap/Makefile.nmake b/writecap/Makefile.nmake index 3862ca541f..a3bab4b7ce 100644 --- a/writecap/Makefile.nmake +++ b/writecap/Makefile.nmake @@ -25,11 +25,11 @@ WRITECAP_OBJECTS = \ RUNLEX=../tools/runlex.sh -libcaputils.lib : ..\config.h $(WRITECAP_OBJECTS) - link /lib /out:libcaputils.lib $(WRITECAP_OBJECTS) +libwritecap.lib : ..\config.h $(WRITECAP_OBJECTS) + link /lib /out:libwritecap.lib $(WRITECAP_OBJECTS) clean: - rm -f $(WRITECAP_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libcaputils.lib \ + rm -f $(WRITECAP_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libwritecap.lib \ *.nativecodeanalysis.xml *.pdb *.sbr \ doxygen.cfg html/*.* if exist html rmdir html |