From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 18 Apr 2013 16:05:58 +0000 (+0000)
Subject: drop usage of deprecated automake INCLUDES variable
X-Git-Tag: auth-3.3-rc1~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fe22eb9631be1b59991efbee4362dd220743e01;p=thirdparty%2Fpdns.git

drop usage of deprecated automake INCLUDES variable

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3163 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index fadbc01b07..a754f38878 100644
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -1,10 +1,8 @@
-AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS)
+AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS)
 lib_LTLIBRARIES = libgmysqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-INCLUDES=@MYSQL_inc@
-
 libgmysqlbackend_la_SOURCES=gmysqlbackend.cc gmysqlbackend.hh \
 		smysql.hh smysql.cc
 
diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am
index e903f624bc..7e95ac8dd1 100644
--- a/modules/godbcbackend/Makefile.am
+++ b/modules/godbcbackend/Makefile.am
@@ -1,10 +1,8 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=-I@UNIXODBC_incdir@ @THREADFLAGS@
 lib_LTLIBRARIES = libgodbcbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-INCLUDES=-I@UNIXODBC_incdir@
-
 libgodbcbackend_la_SOURCES=godbcbackend.cc godbcbackend.hh \
                 sodbc.hh sodbc.cc
 
diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am
index 990b7cf124..42d4928ee6 100644
--- a/modules/goraclebackend/Makefile.am
+++ b/modules/goraclebackend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
 lib_LTLIBRARIES = libgoraclebackend.la
 #bin_PROGRAMS = soracle
 
@@ -6,8 +6,6 @@ lib_LTLIBRARIES = libgoraclebackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-INCLUDES= $(ORACLE_CFLAGS) 
-
 libgoraclebackend_la_SOURCES=goraclebackend.cc goraclebackend.hh \
 		soracle.hh soracle.cc
 
diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index f28d7b04f9..344e162cec 100644
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -1,8 +1,7 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@
 lib_LTLIBRARIES = libgpgsqlbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
-INCLUDES=-I@PGSQL_incdir@
 
 libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \
 		spgsql.hh spgsql.cc
diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am
index a2374bddde..bfb75f884d 100644
--- a/modules/luabackend/Makefile.am
+++ b/modules/luabackend/Makefile.am
@@ -1,8 +1,7 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=-I/usr/include/lua5.1 @THREADFLAGS@
+#AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT @THREADFLAGS@
 EXTRA_DIST=OBJECTFILES OBJECTLIBS 
 
-INCLUDES=-I/usr/include/lua5.1
-#INCLUDES=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT
 
 lib_LTLIBRARIES = libluabackend.la
 
diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am
index 62f098ac3d..5b4ec1bf92 100644
--- a/modules/mydnsbackend/Makefile.am
+++ b/modules/mydnsbackend/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS=@THREADFLAGS@
-INCLUDES=@MYSQL_inc@
+AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@
 lib_LTLIBRARIES = libmydnsbackend.la 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh 
diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am
index e6f50022b7..7e5adcb28c 100644
--- a/modules/oraclebackend/Makefile.am
+++ b/modules/oraclebackend/Makefile.am
@@ -1,11 +1,9 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
 
 lib_LTLIBRARIES = liboraclebackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.sql dropschema.sql
 
-INCLUDES= $(ORACLE_CFLAGS)
-
 liboraclebackend_la_SOURCES=oraclebackend.cc oraclebackend.hh
 liboraclebackend_la_LDFLAGS=-module -avoid-version $(ORACLE_LIBS)
 liboraclebackend_la_LIBADD=-lclntsh
diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index a7c3663891..13654a0a6a 100644
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -1,9 +1,7 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=@CDB_CFLAGS@ @THREADFLAGS@
 lib_LTLIBRARIES = libtinydnsbackend.la
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
-INCLUDES=@CDB_CFLAGS@
-
 libtinydnsbackend_la_SOURCES=cdb.cc cdb.hh tinydnsbackend.cc tinydnsbackend.hh
 libtinydnsbackend_la_LDFLAGS=-module -avoid-version @CDB_LIBS@
\ No newline at end of file
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b121e11789..a7655eda6c 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -262,7 +262,6 @@ pdns_recursor_LDADD=
 pdns_control_SOURCES=dynloader.cc dynmessenger.cc  arguments.cc logger.cc statbag.cc \
 misc.cc unix_utility.cc qtype.cc
 
-pdns_control_INCLUDES=path.hh
 pdns_control_LDFLAGS=@THREADFLAGS@
 
 dnslabeltext.cc: dnslabeltext.rl
diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index b4c6e7c51f..62cd527312 100644
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -1,6 +1,5 @@
-INCLUDES=-I../.. 
 noinst_LTLIBRARIES = libbind2backend.la
-AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@
+AM_CPPFLAGS=-I../.. $(BOOST_CPPFLAGS) @THREADFLAGS@
 
 BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h