aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2013-03-12 06:53:39 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2013-03-12 06:53:39 +0000
commit827eb58b04412109a63a38b23b57d59468b6a3c0 (patch)
treedad7a713de6e493806959b19a2a98aa7d1644463 /epan
parent2cc00294c79fa9e9815a66f1ca39c58c111b3d4d (diff)
From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools. svn path=/trunk/; revision=48261
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.am2
-rw-r--r--epan/crypt/Makefile.am6
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dissectors/Makefile.am2
-rw-r--r--epan/ftypes/Makefile.am2
-rw-r--r--epan/wmem/Makefile.am6
-rw-r--r--epan/wslua/Makefile.am2
-rw-r--r--epan/wspython/Makefile.am2
8 files changed, 12 insertions, 12 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 5585b3a74e..5eafa53b1a 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -60,7 +60,7 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
include Makefile.common
-INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
@LUA_INCLUDES@ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \
$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS)
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index 99759a2fbb..dc1a5734e1 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -21,15 +21,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-INCLUDES = -I$(top_srcdir)
-
include Makefile.common
if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
-AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+ $(LIBGCRYPT_CFLAGS)
noinst_LTLIBRARIES = libairpdcap.la
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 88528568c3..438a5aa197 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -47,7 +47,7 @@ MAINTAINERCLEANFILES = \
$(NODIST_GENERATED_FILES) \
Makefile.in
-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
+AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
#Since code generated by lex may trigger gcc warnings, we are now generating two
#libraries. A single library is generated with the lex code without the barrier
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 17b6fba2e6..3ecbb5cf0a 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -22,7 +22,7 @@
noinst_LTLIBRARIES = libdirtydissectors.la libdissectors.la
-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. \
+AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
include Makefile.common
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index ab3f4f29c3..43e5060562 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -36,7 +36,7 @@ CLEANFILES = \
MAINTAINERCLEANFILES = \
Makefile.in
-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/..
libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am
index 856463dae2..72e7e5889a 100644
--- a/epan/wmem/Makefile.am
+++ b/epan/wmem/Makefile.am
@@ -27,7 +27,9 @@ endif
include Makefile.common
-AM_CPPFLAGS = $(LIBWMEM_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ $(LIBWMEM_CFLAGS)
noinst_LTLIBRARIES = libwmem.la
@@ -41,8 +43,6 @@ DISTCLEANFILES =
MAINTAINERCLEANFILES = \
Makefile.in
-INCLUDES = -I$(top_srcdir)
-
libwmem_la_SOURCES = \
$(LIBWMEM_SRC) \
$(LIBWMEM_INCLUDES)
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 94e6d4e63f..f4a3b4e587 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -25,7 +25,7 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror
endif
-INCLUDES = -I$(top_srcdir) @LUA_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir) @LUA_INCLUDES@
noinst_LTLIBRARIES = libwslua.la
diff --git a/epan/wspython/Makefile.am b/epan/wspython/Makefile.am
index 2777e2c727..3a3ee2ec2f 100644
--- a/epan/wspython/Makefile.am
+++ b/epan/wspython/Makefile.am
@@ -36,7 +36,7 @@ CLEANFILES = \
MAINTAINERCLEANFILES = \
Makefile.in
-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/..
libwspython_la_SOURCES = $(LIBWSPYTHON_SRC) $(LIBWSPYTHON_INCLUDES)