Permalink
Browse files

drop usage of deprecated automake INCLUDES variable

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3163 d19b8d6e-7fed-0310-83ef-9ca221ded41b
  • Loading branch information...
1 parent 6c4e531 commit 3fe22eb9631be1b59991efbee4362dd220743e01 @Habbie Habbie committed Apr 18, 2013
@@ -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
@@ -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
@@ -1,13 +1,11 @@
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
lib_LTLIBRARIES = libgoraclebackend.la
#bin_PROGRAMS = soracle
#soracle_SOURCES=soracle.cc soracle.hh
EXTRA_DIST=OBJECTFILES OBJECTLIBS
-INCLUDES= $(ORACLE_CFLAGS)
-
libgoraclebackend_la_SOURCES=goraclebackend.cc goraclebackend.hh \
soracle.hh soracle.cc
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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@
View
@@ -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
@@ -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

0 comments on commit 3fe22eb

Please sign in to comment.