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 /echld | |
parent | 7b6e5264391521d1519d16ff148a7a62c370e5fd (diff) | |
download | wireshark-b32a5ee98cd4c0e17b900c77b046f7977cbd12bb.tar.gz wireshark-b32a5ee98cd4c0e17b900c77b046f7977cbd12bb.tar.bz2 wireshark-b32a5ee98cd4c0e17b900c77b046f7977cbd12bb.zip |
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 'echld')
-rw-r--r-- | echld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/echld/Makefile.am b/echld/Makefile.am index f92173e58d..8b0898808e 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL +AM_CPPFLAGS += -DWS_BUILD_DLL # Optional objects that I know how to build. These will be # linked into libechld. |