From 20af48f2fdea636997bebf716f23d1e49be21273 Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 4 Mar 2012 12:25:54 +0000
Subject: [PATCH] make really sure we build the sqlite bind dnssec schema
 include file

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2452 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/Makefile.am               | 10 ++++++++--
 pdns/backends/bind/Makefile.am | 14 +++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b991365ed..b9b5da34b 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -6,6 +6,8 @@ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_
 
 SUBDIRS= ext/polarssl-1.1.1 backends 
 
+BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h
+
 noinst_SCRIPTS = pdns
 sysconf_DATA = pdns.conf-dist 
 
@@ -31,7 +33,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 randombackend.cc unix_utility.cc common_startup.cc \
 utility.hh iputils.hh common_startup.hh unix_semaphore.cc \
-backends/bind/bindbackend2.cc  backends/bind/binddnssec.cc \
+backends/bind/bindbackend2.cc  backends/bind/binddnssec.cc bind-dnssec.schema.sqlite3.sql.h \
 backends/bind/bindparser.cc backends/bind/bindlexer.c \
 backends/gsql/gsqlbackend.cc \
 backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh \
@@ -70,7 +72,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh
         misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
 	logger.cc statbag.cc qtype.cc sillyrecords.cc nsecrecords.cc dnssecinfra.cc dnssecinfra.hh \
         base32.cc  ueberbackend.cc dnsbackend.cc arguments.cc packetcache.cc dnspacket.cc  \
-        backends/bind/bindbackend2.cc backends/bind/binddnssec.cc  \
+        backends/bind/bindbackend2.cc backends/bind/binddnssec.cc  bind-dnssec.schema.sqlite3.sql.h\
 	backends/bind/bindparser.cc backends/bind/bindlexer.c \
 	backends/gsql/gsqlbackend.cc \
 	backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh zoneparser-tng.cc \
@@ -217,6 +219,10 @@ pdns_control_LDFLAGS=@THREADFLAGS@
 
 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[]=' ; sed 's/$$/"/g' ../../bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g'  ; echo ';' ) > $@
+
 	
 backends/bind/%:
 	make -C backends/bind $(@F)
diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index 99fd06e8f..88ca91917 100644
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -2,6 +2,12 @@ INCLUDES=-I../..
 noinst_LTLIBRARIES = libbind2backend.la
 AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@
 
+BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h
+
+bind-dnssec.schema.sqlite3.sql.h: ../../bind-dnssec.schema.sqlite3.sql
+	( echo 'static char sqlCreate[]=' ; sed 's/$$/"/g' ../../bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g'  ; echo ';' ) > $@
+
+
 libbind2backend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
 bindlexer.l ../../zoneparser-tng.cc ../../misc.cc  \
 bindparser.hh ../../unix_utility.cc binddnssec.cc bind-dnssec.schema.sqlite3.sql.h
@@ -12,16 +18,16 @@ libbind2backend_la_LDFLAGS=-module -avoid-version
 
 bin_PROGRAMS = zone2sql zone2ldap
 
-EXTRA_DIST=dnslabeltext.cc bindparser.cc bindparser.h
+EXTRA_DIST=dnslabeltext.cc bindparser.cc bindparser.h bind-dnssec.schema.sqlite3.sql.h
 
-zone2sql_SOURCES=bindparser.yy bindlexer.l \
+zone2sql_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \
 ../../arguments.cc ../../logger.cc zone2sql.cc ../../statbag.cc ../../misc.cc \
 ../../unix_utility.cc ../../qtype.cc ../../dns.cc \
 ../../zoneparser-tng.cc ../../dnsrecords.cc ../../sillyrecords.cc \
 ../../dnswriter.cc dnslabeltext.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc \
 ../../nsecrecords.cc ../../dnssecinfra.cc  ../../base32.cc ../../md5.cc # ../../dbdnsseckeeper.cc
 
-zone2ldap_SOURCES=bindparser.yy bindlexer.l \
+zone2ldap_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \
 ../../arguments.cc ../../logger.cc zone2ldap.cc ../../statbag.cc ../../misc.cc \
 ../../unix_utility.cc ../../qtype.cc  ../../zoneparser-tng.cc ../../dnsrecords.cc \
 ../../dnswriter.cc dnslabeltext.cc  ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc ../../sillyrecords.cc \
@@ -39,5 +45,3 @@ AM_YFLAGS = -d --verbose --debug
 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[]=' ; sed 's/$$/"/g' ../../bind-dnssec.schema.sqlite3.sql | sed 's/^/"/g'  ; echo ';' ) > $@
-- 
2.49.0