From 13643ceb7396101cc8611c5c366df2a7f0fa5c17 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@inl.fr>
Date: Thu, 22 Jan 2009 14:11:14 +0100
Subject: Replace INCLUDES by AM_CPPFLAGS in Makefile.am.

This patch fixes autotools warning about deprecated usage of INCLUDES in
Makefile.am.
---
 Makefile.am                   | 2 +-
 filter/Makefile.am            | 2 +-
 filter/raw2packet/Makefile.am | 2 +-
 input/flow/Makefile.am        | 2 +-
 input/packet/Makefile.am      | 2 +-
 libipulog/Makefile.am         | 2 +-
 output/Makefile.am            | 2 +-
 output/dbi/Makefile.am        | 2 +-
 output/mysql/Makefile.am      | 2 +-
 output/pcap/Makefile.am       | 2 +-
 output/pgsql/Makefile.am      | 2 +-
 output/sqlite3/Makefile.am    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ac35ce3..837fff6 100644
--- 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 5c4e4ab..2483119 100644
--- 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 25111a8..aa82e04 100644
--- 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 012feb8..11bf217 100644
--- 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 716ed38..e90e46e 100644
--- 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 ec9ea6d..a205cc6 100644
--- 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 beceb6b..a4335c8 100644
--- 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 382e698..28c45a6 100644
--- 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 b807a4d..50f3f92 100644
--- 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 5e2019f..b77b2d3 100644
--- 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 e1e0d9f..e8f4acc 100644
--- 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 736ecd4..df1272a 100644
--- 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
-- 
cgit v1.2.3