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 fadbc01b07e5586780906ef858a265ebb79f245b..a754f3887870346767098f59374e46694b5f3a78 100644 (file)
--- 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 e903f624bc8cbede6d90c5901e736328f261ecdd..7e95ac8dd189c1b279f2549ce5390dce7ae1ed37 100644 (file)
--- 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 990b7cf124226958dc3943acd90b35f887cb23f3..42d4928ee647485d80686fda5d6baa33c12a2cc2 100644 (file)
--- 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 f28d7b04f915b15b0c4f247b349015c2b4b510a0..344e162ceccaa85b7e951899b8e5cc0062570fc5 100644 (file)
--- 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 a2374bddde51759c91cd6ecc862f7713e1ba1a27..bfb75f884dae1f35feab1f442cc72dd178a4fad5 100644 (file)
--- 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 62f098ac3d155bbd6bbf8e6bf5796a91a0ebc9cc..5b4ec1bf92b9fd38446648f24c8793bb1032836b 100644 (file)
--- 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 e6f50022b7bd09c54acac57bb5e41787c79c12cd..7e5adcb28c9fb8fd00ae7c1e537b6d0e295fd66e 100644 (file)
--- 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 a7c3663891fee9fdab5a77b2948d46ac6c75036a..13654a0a6a4ca22f8ba09f7cd92e8670e1247fa1 100644 (file)
--- 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 b121e117895f4ba13fcb9a4e12c9caf4dace742d..a7655eda6c56f171ed178e55bc7d68763cf3d6b7 100644 (file)
--- 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 b4c6e7c51ff378092f002a48af38e7485f8bca6d..62cd5273128ae5c1bdb27fce42d2255ff57c1a58 100644 (file)
--- 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