From David Arnold:

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

svn path=/trunk/; revision=48261

diff --git a/Makefile.am b/Makefile.am
index 7d57b72d0d7b9b267bd411bb9bc8f2878afc9372..4a29f41aae55da7a7b01885610cf13f80f760efb 100644 (file)
--- 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 5585b3a74ee5dde02526ad7fc0f52088620ad92f..5eafa53b1a5bb17b4402249fd42cb0a2468e6f64 100644 (file)
--- 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 99759a2fbb7a59c6d81d8854a6f29279d8a5633f..dc1a5734e1445fa60181cf5b2518b47fac323b3a 100644 (file)
--- 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 88528568c3feaa291b4e876971c48e592d790a90..438a5aa197f3a69a6fa2e79fb67fbd00dda06355 100644 (file)
--- 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 17b6fba2e69b229086003b53ec8b8cfe2d45c181..3ecbb5cf0ad185b03b911425879b52dd63f6e1d1 100644 (file)
--- 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 ab3f4f29c39d5a25051fe3375cfa637cabe63d78..43e50605628b932057897d71500cc3d6b2e80db7 100644 (file)
--- 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 856463dae20bcd5b1f18ab7bedcc4e373c933200..72e7e5889af1a26818145eeac4432eccff762a00 100644 (file)
--- 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 94e6d4e63f46348cdd5a9e1e86c64cc33f681b55..f4a3b4e587a37d9e813e366b7f58a18df37b2ce4 100644 (file)
--- 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 2777e2c727b9a534e56d0a22a1374ebd891ba205..3a3ee2ec2fbb956644cc72b6af2a6ef3c141e02b 100644 (file)
--- 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 21aebd2229d20b9d2c590997dc1f8bdadbea341b..873c6e46a9d7ac1bdef79989783dfaaac8d4f6ba 100644 (file)
--- 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 1ff4b4b41f73acdbd6700382ef1afe31d05957be..308fe5af08e13bfbff0fb9200e67e6d180b9d2b2 100644 (file)
--- 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 35b644d0a369c09ebe7ab31e66559e88782c17ab..544ee4f59fc3b63e0e2d7c57a64d56f474bf5561 100644 (file)
--- 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 f04591d3926555b9d6032a70bf3aedaaa84e503c..df171466d96f7895ddfa79e153be46144610bfd0 100644 (file)
--- 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 b9a39c14b671c1be45b34ebc91938ecd1fa6a433..cfb40869f3b7fe538d08da0f61d9e4588b6aefcf 100644 (file)
--- 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 c1acf4a7f0f73876a890c0b05560500606410086..d0e4545c61e89ee8aa86324fd179ddaf74601cee 100644 (file)
--- 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 70fa598fb9dbf584529db6936bd943030abd3376..3f0a59eb95affafb7f4c9bee62d7c814fe9f184a 100644 (file)
--- 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 4fc4b6147fb9f4805ae415c06159dbc51ccfd78f..1b1727f5963f54259dbb71faa85673d872deba78 100644 (file)
--- 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 4a932e50cba4e4a956761bd0baf4356bf61a4205..5636befdb9a60997670cf28bda1f508cf77fb780 100644 (file)
--- 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 e33efafebd302f4341f96ff69f84ea859e32cf37..0239142d49343be7584c6a9c5faaeb8cea38c6b3 100644 (file)
--- 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 026d7468421769d0c86f523d54a02e753a6d7d37..1f3370afbdfdfcb484839a7cdf3c10e031432833 100644 (file)
--- 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 32974faa318c6a86c39cc97951c3e5fc2d631163..a48b442ff69c9658579f0a4d717d19641f538466 100644 (file)
--- 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 52d3509d18cc913b2160b045741643baba9f43c1..d677789306e61280f7494b78225d1feef8f2268b 100644 (file)
--- 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 1ccc3c72beff2fb950f23a67de2b6353079422fa..259d10e9d7014d62f3c53e497b6305e9a917b05c 100644 (file)
--- 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 af04d4747ff44a0976b792c1489c9fbf88522bd4..81a9b6eab02b0a9cf72936eb422bb6ad06c6f818 100644 (file)
--- 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 9289b97c65131c91e84a4469e40392c8e3e9c3fd..fc430dc96151ca1e29dfc00f0d4afb1c66dc7743 100644 (file)
--- 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 7a3774faaac46e531bc08b31e1038703e73b9e42..99e18ac778500011086c39cc5e72dd6df93f2bbc 100644 (file)
--- 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)        \