Drop Python dissectors directory flag from programs that don't have dissectors.

Win32: remove superfluous dumpcap build dependancy on wiretap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35365 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 2cf3f2766d6c16789c359f2cc687f1060168e58b..5c2a1fce0a454d5375377e27069a8412cdc1d8a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -402,7 +402,7 @@ mergecap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-mergecap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+mergecap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link capinfos.
 capinfos_LDADD = \
@@ -410,14 +410,14 @@ capinfos_LDADD = \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@                     \
        @LIBGCRYPT_LIBS@
-capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link editcap.
 editcap_LDADD = \
        wiretap/libwiretap.la           \
        wsutil/libwsutil.la             \
        @GLIB_LIBS@
-editcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
@@ -429,7 +429,7 @@ randpkt_LDADD = \
        @NSL_LIBS@                      \
        @C_ARES_LIBS@                   \
        @ADNS_LIBS@
-randpkt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Libraries and plugin flags with which to link dftest.
 dftest_LDADD = \
@@ -460,7 +460,7 @@ dumpcap_LDADD = \
        @NSL_LIBS@                      \
        @CORESERVICES_FRAMEWORKS@       \
        @LIBCAP_LIBS@
-dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \

diff --git a/Makefile.nmake b/Makefile.nmake
index b5263ac879f7852966743baf60b93916e1d585f4..d945a334a4f49adabb654984bf5df48fb4222ec7 100644 (file)
--- 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