osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix nmake build for new extcap and writecap binaries. 

Change-Id: Ic7f370cfe5e2a3aad81c77baab066e95a249238f
Reviewed-on: https://code.wireshark.org/review/14631
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-03-25 20:48:07 -04:00
parent f7e0a8cc38
commit 2b8f409324
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.nmake
View File

@ -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

6
extcap/Makefile.nmake
View File

@ -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)

6
writecap/Makefile.nmake
View File

@ -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