Remove some {-I,/I} flags.

They should not be necessary.

Change-Id: I9246d86862392c65839c18d13d8634bcf510d55e
Reviewed-on: https://code.wireshark.org/review/13992
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/capchild/Makefile.am b/capchild/Makefile.am
index 4d75e0b36f3512a6ec0ad3c8ecaafe15ea1fb191..9bdb3871f3ca2f684e93d827c576b611c1c782c0 100644 (file)
--- a/capchild/Makefile.am
+++ b/capchild/Makefile.am
@@ -22,8 +22,6 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
-
 noinst_LIBRARIES = libcapchild.a
 
 CLEANFILES = \

diff --git a/capchild/Makefile.nmake b/capchild/Makefile.nmake
index be4d1820e53c34d3f48d4e000a13816f38478429..8220bafd01b1674c755f298d79b84523a2254ef0 100644 (file)
--- a/capchild/Makefile.nmake
+++ b/capchild/Makefile.nmake
@@ -11,12 +11,10 @@ include ..\Makefile.nmake.inc
 GENERATED_CFLAGS=\
        $(STANDARD_CFLAGS) \
        /Zm800 \
-       /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
+       /I.. $(GLIB_CFLAGS) \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
-       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
-       $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) $(WINSPARKLE_CFLAGS) \
-       $(HHC_CFLAGS)
+       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
 
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 

diff --git a/caputils/Makefile.am b/caputils/Makefile.am
index 94db958c001f244e5a604a23297dabdcb568571e..7ccf86c6c5ca6b0131a6733142f2b3eb3e6f592d 100644 (file)
--- a/caputils/Makefile.am
+++ b/caputils/Makefile.am
@@ -22,8 +22,6 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
-
 noinst_LIBRARIES = libcaputils.a
 
 PLATFORM_CAPUTILS_SRC = \

diff --git a/caputils/Makefile.nmake b/caputils/Makefile.nmake
index 6c38e33f3f794b4c75a01994ef22a0dabef520aa..901b8a84f9b61fb1db85d6e1bf6997961ce834a3 100644 (file)
--- a/caputils/Makefile.nmake
+++ b/caputils/Makefile.nmake
@@ -12,12 +12,10 @@ include Makefile.common
 GENERATED_CFLAGS=\
        $(STANDARD_CFLAGS) \
        /Zm800 \
-       /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
+       /I.. $(GLIB_CFLAGS) \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
        /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
-       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
-       $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) $(WINSPARKLE_CFLAGS) \
-       $(HHC_CFLAGS)
+       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
 
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 

diff --git a/randpkt_core/Makefile.nmake b/randpkt_core/Makefile.nmake
index 708d4f068fd4b432256347079ee617671574f0f2..d834d9d7bd011d4b58bc12f9e745e1ece536d1a1 100644 (file)
--- a/randpkt_core/Makefile.nmake
+++ b/randpkt_core/Makefile.nmake
@@ -11,12 +11,7 @@ include ..\Makefile.nmake.inc
 GENERATED_CFLAGS=\
        $(STANDARD_CFLAGS) \
        /Zm800 \
-       /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
-       /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
-       /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
-       /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
-       $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) $(WINSPARKLE_CFLAGS) \
-       $(HHC_CFLAGS)
+       /I.. $(GLIB_CFLAGS)
 
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)