aboutsummaryrefslogtreecommitdiffstats
path: root/caputils
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-18 05:40:38 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-18 14:38:19 +0000
commit50a91658319706925decec69dda9ff185c750710 (patch)
tree9306325909d17e3c868d52cc25145d60b49a1ade /caputils
parent406161a3476b53913fb0d06cbba26c0718bb5e11 (diff)
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>
Diffstat (limited to 'caputils')
-rw-r--r--caputils/Makefile.am2
-rw-r--r--caputils/Makefile.nmake6
2 files changed, 2 insertions, 6 deletions
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)