diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-18 04:06:13 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-18 12:55:26 +0000 |
| commit | b32a5ee98cd4c0e17b900c77b046f7977cbd12bb (patch) | |
| tree | 570a94b1eac6a16e37d71e97209337e1e9dbe3aa /extcap | |
| parent | 7b6e5264391521d1519d16ff148a7a62c370e5fd (diff) | |
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 <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 'extcap')
| -rw-r--r-- | extcap/Makefile.am | 2 | ||||
| -rw-r--r-- | extcap/Makefile.nmake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/extcap/Makefile.am b/extcap/Makefile.am index 08ea26e641..432b85d804 100644 --- a/extcap/Makefile.am +++ b/extcap/Makefile.am @@ -23,8 +23,6 @@ include ../Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += -I$(top_srcdir)/wiretap - extcap_PROGRAMS = \ @androiddump_bin@ \ @randpktdump_bin@ \ diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake index 7845326ec6..511b139b71 100644 --- a/extcap/Makefile.nmake +++ b/extcap/Makefile.nmake @@ -17,7 +17,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ - /I. /I.. /Iwiretap $(GLIB_CFLAGS) \ + /I. /I.. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) |