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 /capchild | |
| parent | 7b6e5264391521d1519d16ff148a7a62c370e5fd (diff) | |
| download | wireshark-b32a5ee98cd4c0e17b900c77b046f7977cbd12bb.tar.gz | |
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 'capchild')
| -rw-r--r-- | capchild/Makefile.am | 3 | ||||
| -rw-r--r-- | capchild/Makefile.nmake | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/capchild/Makefile.am b/capchild/Makefile.am index 5251b047ff..4d75e0b36f 100644 --- a/capchild/Makefile.am +++ b/capchild/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 = libcapchild.a diff --git a/capchild/Makefile.nmake b/capchild/Makefile.nmake index fa10b26f32..be4d1820e5 100644 --- a/capchild/Makefile.nmake +++ b/capchild/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) \ |