Replace INCLUDES by AM_CPPFLAGS in Makefile.am.

This patch fixes autotools warning about deprecated usage of INCLUDES in
Makefile.am.

diff --git a/Makefile.am b/Makefile.am
index ac35ce35d8c1d234d01db5e6da63467114b0a6d9..837fff6c2a3d993acb39b0014c88a3a218fd580f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ man_MANS = ulogd.8
 
 EXTRA_DIST = $(man_MANS) debian ulogd.logrotate ulogd.spec ulogd.conf.in doc
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include libipulog src input filter output
 
 noinst_DATA = ulogd.conf

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 5c4e4abc9588f2795a105bc740a02e58b317fa30..24831196e24046b752cf8c788dad61d672173f7d 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = raw2packet packet2flow
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 
 pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
                     ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \

diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index 25111a8353cbbbfb3d7e77eb985558d8ce22389e..aa82e046527b2f66e1c16dd22f40c25207d1c166 100644 (file)
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 
 pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la 
 

diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 012feb8dc1663b4672361c94f650bb611f6d3315..11bf217693a38378e65e937c56ccdcf56320a554 100644 (file)
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-fPIC -Wall
 
 pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 716ed386543fd019cd52539fa307d61613b0f8b9..e90e46e6af69c5409ae4fe738b76b820272ac104 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-fPIC -Wall
 LIBS=
 

diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index ec9ea6d2b6122f98c4287ea2bf577fae2d07b139..a205cc6d3fe47b5a218809f806da9391400050c5 100644 (file)
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 
 AM_CFLAGS=-fPIC
 

diff --git a/output/Makefile.am b/output/Makefile.am
index beceb6b2a34e99e775d0735f451ac79a2c60365a..a4335c8d4a156b8a70f62c3042591b4408e0eb51 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 LIBS=""
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi

diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index 382e698afd5186dd32b4ce542a32019738625794..28c45a601270fbc3e836449bc6a9918417d64a8a 100644 (file)
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include $(DBI_INC)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(DBI_INC)
 LIBS=$(DBI_LIB)
 
 if HAVE_DBI

diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index b807a4d23d5dd3e1b0f3e9e3bcb5135a0992912c..50f3f92c840b7c907c71520b4db12e5530cc57b6 100644 (file)
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include $(MYSQL_INC)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(MYSQL_INC)
 LIBS=$(MYSQL_LIB)
 
 if HAVE_MYSQL

diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index 5e2019f320c59be19c5f297803a86e9cabcc5c49..b77b2d3a6b64a5cd1215e6c5d14fdb33c92c3ade 100644 (file)
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include $(PCAP_INC)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(PCAP_INC)
 LIBS=$(PCAP_LIB)
 
 if HAVE_PCAP

diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index e1e0d9fb17fe7003a12e0f77ace949bc216e434a..e8f4accb0c665266a18841d040b87b6c6bcbc397 100644 (file)
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(PQINCPATH)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(PQINCPATH)
 LIBS=$(PQLIBS)
 
 if HAVE_PGSQL

diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index 736ecd4c95ae73f45217edd42d8cb4dbe6a32671..df1272a9a1f5d7461df31892bec62b211e1d253c 100644 (file)
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include $(SQLITE3_INC)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(SQLITE3_INC)
 LIBS=$(SQLITE3_LIB)
 
 if HAVE_SQLITE3