move bind-dnssec.schema.sqlite3.sql.h to /pdns

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index 4cc7483cdcbac1465164490350675b5c6466e179..bedfd5029b7e9d91e4bc379a4e8b6007d9a0bee8 100644 (file)
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS=-I../../pdns $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) @THREADFLAGS@
 AM_LFLAGS = -s -i
 AM_YFLAGS = -d --verbose --debug
 
-BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h
+BUILT_SOURCES=../../pdns/bind-dnssec.schema.sqlite3.sql.h
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
@@ -12,6 +12,5 @@ libbindbackend_la_SOURCES=bindbackend2.cc bindbackend2.hh binddnssec.cc ../../pd
 
 libbindbackend_la_LDFLAGS=-module -avoid-version
 
-bind-dnssec.schema.sqlite3.sql.h: ../../pdns/bind-dnssec.schema.sqlite3.sql
+../../pdns/bind-dnssec.schema.sqlite3.sql.h: ../../pdns/bind-dnssec.schema.sqlite3.sql
        ( echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' ../../pdns/bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g'  ; echo ';' ) > $@
-

diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc
index a9e32351df16b2c4a9db8dec098afb1306eda22e..0b93695c1d52617bb98de86aa1da1371d6b580fa 100644 (file)
--- a/modules/bindbackend/binddnssec.cc
+++ b/modules/bindbackend/binddnssec.cc
@@ -21,7 +21,7 @@
 */
 #include "bindbackend2.hh"
 #include "pdns/dnsrecords.hh"
-#include "bind-dnssec.schema.sqlite3.sql.h"
+#include "pdns/bind-dnssec.schema.sqlite3.sql.h"
 #include <boost/foreach.hpp>
 #include "config.h"
 #include "pdns/arguments.hh"

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index df72292cd7b767df0f0941ea2ae0e3eea08c25af..267f96fe46523f058bf8c57491ad37b84ee099f7 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,11 +1,10 @@
 
 AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
 
-AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS)
-
 AM_LFLAGS = -s -i
 AM_YFLAGS = -d --verbose --debug
 
+AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(LIBCURL_CFLAGS)
 if BOTAN110
 AM_CPPFLAGS += $(BOTAN110_CFLAGS)
 endif
@@ -23,7 +22,7 @@ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_
 
 SUBDIRS= $(POLARSSL_SUBDIR)
 
-BUILT_SOURCES=version_generated.h
+BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h
 CLEANFILES=version_generated.h
 
 noinst_SCRIPTS = pdns
@@ -51,6 +50,7 @@ dynlistener.cc dynlistener.hh  dynhandler.cc dynhandler.hh  \
 resolver.hh resolver.cc slavecommunicator.cc mastercommunicator.cc communicator.cc communicator.hh dnsproxy.cc \
 dnsproxy.hh unix_utility.cc common_startup.cc \
 utility.hh iputils.hh common_startup.hh unix_semaphore.cc \
+bind-dnssec.schema.sqlite3.sql.h \
 bindparser.cc bindlexer.c \
 backends/gsql/gsqlbackend.cc \
 backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh \
@@ -320,6 +320,9 @@ TESTS=testrunner
 dnslabeltext.cc: dnslabeltext.rl
        ragel dnslabeltext.rl -o dnslabeltext.cc
 
+bind-dnssec.schema.sqlite3.sql.h: bind-dnssec.schema.sqlite3.sql
+       ( echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g'  ; echo ';' ) > $@
+
 build_date=$(shell LC_TIME=C date '+%Y%m%d%H%M%S')
 build_host=$(shell id -u -n)@$(shell hostname -f)
 if RELEASE_BUILD

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 73ae638514ed6da31dfdb0a91e41242a6da82655..63f3078336935a6d9ec50ef0866733c04c8f703f 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -15,7 +15,7 @@
 #include "dns_random.hh"
 #ifdef HAVE_SQLITE3
 #include "ssqlite3.hh"
-#include "../modules/bindbackend/bind-dnssec.schema.sqlite3.sql.h"
+#include "bind-dnssec.schema.sqlite3.sql.h"
 #endif
 
 StatBag S;

diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index ba061c9c07439686f6628a1fefdb4e9931e97e2e..3c29cff0b77c4533e4b0721c6d18d7ed04b6b5f4 100644 (file)
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -140,7 +140,6 @@ public:
   bool deleteTSIGKey(const string& name);
   bool getTSIGKeys(std::vector< struct TSIGKey > &keys);
 
-
   void alsoNotifies(const string &domain, set<string> *ips); 
   void rediscover(string* status=0);
   void reload();