include new JSON stuff in recursor tarball & separate build

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2899 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index fb6f594d983ea3be7b8bcb2fce8c44e3f9b7ec84..b959ef4fd3150728bf0680ae592ba09b5638046d 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -20,7 +20,7 @@ dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \
 rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
 dns_random.o aescrypt.o aeskey.o aes_modes.o aestab.o dnslabeltext.o \
 lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
-reczones.o base32.o nsecrecords.o
+reczones.o base32.o nsecrecords.o json.o json_ws.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o misc.o \
        unix_utility.o logger.o qtype.o

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 0ccb78a3b06b7ae33d297748e63c26579b21de18..cf068f166c461e6d0cb1ce1770682b58a692d5d1 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -12,7 +12,7 @@ recursor_cache.hh rec_channel.hh qtype.hh misc.hh dns.hh syncres.hh \
 sstuff.hh mtasker.hh mtasker.cc lwres.hh logger.hh ahuexception.hh \
 mplexer.hh win32_mtasker.hh win32_utility.cc ntservice.hh singleton.hh \
 recursorservice.hh dns_random.hh lua-pdns.hh lua-recursor.hh namespaces.hh \
-recpacketcache.hh base32.hh cachecleaner.hh"
+recpacketcache.hh base32.hh cachecleaner.hh json.hh"
 
 CFILES="syncres.cc  misc.cc unix_utility.cc qtype.cc \
 logger.cc arguments.cc  lwres.cc pdns_recursor.cc  \
@@ -22,7 +22,7 @@ selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \
 win32_mtasker.cc win32_rec_channel.cc win32_logger.cc ntservice.cc \
 recursorservice.cc sillyrecords.cc lua-pdns.cc lua-recursor.cc randomhelper.cc \
 devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc base32.cc nsecrecords.cc \
-dnslabeltext.cc"
+dnslabeltext.cc json.cc json_ws.cc json_ws.hh"
 
 cd docs
 make pdns_recursor.1 rec_control.1