From 50a91658319706925decec69dda9ff185c750710 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 18 Feb 2016 05:40:38 -0800 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- caputils/Makefile.am | 2 -- caputils/Makefile.nmake | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'caputils') diff --git a/caputils/Makefile.am b/caputils/Makefile.am index 94db958c00..7ccf86c6c5 100644 --- 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 6c38e33f3f..901b8a84f9 100644 --- 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) -- cgit v1.2.1