From b32a5ee98cd4c0e17b900c77b046f7977cbd12bb Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 18 Feb 2016 04:06:13 -0800 Subject: Don't add the wiretap directory to the list of include directories. If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- ui/cli/Makefile.am | 3 +-- ui/cli/Makefile.nmake | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'ui/cli') diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index 0ad3b8e757..3242543d41 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \ - $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) noinst_LIBRARIES = libcliui.a diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake index 09c7414e33..f7e9a89b37 100644 --- a/ui/cli/Makefile.nmake +++ b/ui/cli/Makefile.nmake @@ -11,7 +11,7 @@ include ..\..\Makefile.nmake.inc GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /Zm800 \ - /I../.. /I../../wiretap $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ + /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) \ -- cgit v1.2.1