diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2011-01-04 22:12:25 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2011-01-04 22:12:25 +0000 |
| commit | bc31879963e9d2a51345d9c6035e9b454818b411 (patch) | |
| tree | 863360a28524c96ea04c9d539941ba0c3093e601 /Makefile.nmake | |
| parent | 7a5c44beed55df072404ae7873f6310677826071 (diff) | |
| download | wireshark-bc31879963e9d2a51345d9c6035e9b454818b411.tar.gz | |
Drop Python dissectors directory flag from programs that don't have dissectors.
Win32: remove superfluous dumpcap build dependancy on wiretap.
svn path=/trunk/; revision=35365
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b5263ac879..d945a334a4 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -156,8 +156,7 @@ dumpcap_LIBS= \ wsock32.lib user32.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) \ - $(GTHREAD_LIBS) \ - $(PYTHON_LIBS) + $(GTHREAD_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ @@ -341,7 +340,7 @@ randpkt.exe : $(randpkt_OBJECTS) mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res +dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) wsutil\libwsutil.lib image\dumpcap.res @echo Linking $@ $(LINK) @<< /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) image\dumpcap.res |