diff options
-rw-r--r-- | capchild/Makefile.am | 2 | ||||
-rw-r--r-- | capchild/Makefile.nmake | 6 | ||||
-rw-r--r-- | caputils/Makefile.am | 2 | ||||
-rw-r--r-- | caputils/Makefile.nmake | 6 | ||||
-rw-r--r-- | randpkt_core/Makefile.nmake | 7 |
5 files changed, 5 insertions, 18 deletions
diff --git a/capchild/Makefile.am b/capchild/Makefile.am index 4d75e0b36f..9bdb3871f3 100644 --- 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 be4d1820e5..8220bafd01 100644 --- 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 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) diff --git a/randpkt_core/Makefile.nmake b/randpkt_core/Makefile.nmake index 708d4f068f..d834d9d7bd 100644 --- 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) |