Move cdb.{cc ,hh} to the pdns directory

diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index 1a94480350ec773286684856379ae9786ebd4c0a..e6ccff16e58102649d420f17eaa8ff61ac9594f2 100644 (file)
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -5,7 +5,7 @@ pkglib_LTLIBRARIES = libtinydnsbackend.la
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
 libtinydnsbackend_la_SOURCES = \
-       cdb.cc cdb.hh \
+       ../../pdns/cdb.cc ../../pdns/cdb.hh \
        tinydnsbackend.cc tinydnsbackend.hh
 
 libtinydnsbackend_la_LDFLAGS = -module -avoid-version

diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index 0eb5adb14cffd4213edc9d552964463aa03c6d2e..0dc44461f90b68dd2cc9bc841f85eb48eebd488c 100644 (file)
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -23,15 +23,10 @@
 #include "config.h"
 #endif
 #include "tinydnsbackend.hh"
-#include "pdns/lock.hh"
-#include <cdb.h>
 #include "pdns/misc.hh"
-#include "pdns/iputils.hh"
-#include "pdns/dnspacket.hh"
 #include "pdns/dnsrecords.hh"
 #include <utility>
 
-
 static string backendname="[TinyDNSBackend] ";
 uint32_t TinyDNSBackend::s_lastId;
 pthread_mutex_t TinyDNSBackend::s_domainInfoLock=PTHREAD_MUTEX_INITIALIZER;

diff --git a/modules/tinydnsbackend/tinydnsbackend.hh b/modules/tinydnsbackend/tinydnsbackend.hh
index bdb4888dac2b58e2ed113e08057022d2369c0ee9..2de0e462ec3337faaf6321e03a4c99a5bd3bfbf7 100644 (file)
--- a/modules/tinydnsbackend/tinydnsbackend.hh
+++ b/modules/tinydnsbackend/tinydnsbackend.hh
@@ -26,11 +26,10 @@
 #include "pdns/logger.hh"
 #include "pdns/iputils.hh"
 #include "pdns/dnspacket.hh"
-#include <cdb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "cdb.hh"
+#include "pdns/cdb.hh"
 #include "pdns/lock.hh"
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>

diff --git a/modules/tinydnsbackend/cdb.cc b/pdns/cdb.cc
similarity index 100%
rename from modules/tinydnsbackend/cdb.cc
rename to pdns/cdb.cc

diff --git a/modules/tinydnsbackend/cdb.hh b/pdns/cdb.hh
similarity index 100%
rename from modules/tinydnsbackend/cdb.hh
rename to pdns/cdb.hh