From David Arnold:

Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261

26 files changed, 31 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 7d57b72d0d..4a29f41aae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,6 @@
 
 ACLOCAL_AMFLAGS = `./aclocal-flags`
 
-INCLUDES= @LUA_INCLUDES@
-
 if HAVE_LIBPY
 py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\"
 else
@@ -535,7 +533,8 @@ dumpcap_LDFLAGS = $(PIE_LDFLAGS)
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
-	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS)
+	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(PY_CFLAGS) \
+	@LUA_INCLUDES@
 
 #
 # Build the version string
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)
 
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index 21aebd2229..873c6e46a9 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 1ff4b4b41f..308fe5af08 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index 35b644d0a3..544ee4f59f 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index f04591d392..df171466d9 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -26,7 +26,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index b9a39c14b6..cfb40869f3 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
index c1acf4a7f0..d0e4545c61 100644
--- a/plugins/m2m/Makefile.am
+++ b/plugins/m2m/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir) -I../wimax
+AM_CPPFLAGS = -I$(top_srcdir) -I../wimax
 
 include Makefile.common
 
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 70fa598fb9..3f0a59eb95 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index 4fc4b6147f..1b1727f596 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -25,7 +25,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 4a932e50cb..5636befdb9 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index e33efafebd..0239142d49 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am
index 026d746842..1f3370afbd 100644
--- a/plugins/tpg/Makefile.am
+++ b/plugins/tpg/Makefile.am
@@ -26,7 +26,7 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_CFLAGS = -Werror
 endif
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 plugindir = @plugindir@
 
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index 32974faa31..a48b442ff6 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -25,7 +25,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index 52d3509d18..d677789306 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index 1ccc3c72be..259d10e9d7 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am
index af04d4747f..81a9b6eab0 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/wimaxmacphy/Makefile.am
@@ -24,7 +24,7 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 include Makefile.common
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 9289b97c65..fc430dc961 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -38,7 +38,7 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_NON_GENERATED_CFLAGS += -Werror
 endif
 
-INCLUDES = -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 CLEANFILES = \
 	libwiretap.a		\
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 7a3774faaa..99e18ac778 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -64,7 +64,7 @@ lib_LTLIBRARIES = libwsutil.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
-INCLUDES = -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 libwsutil_la_SOURCES =		\
 	$(LIBWSUTIL_SRC)	\