From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 30 Mar 2015 15:33:37 +0000 (+0200)
Subject: make sure we can 'make dist' again, including built-in webservice
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~88^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed1f29efc78eca04205c089dd63a69ad0e1654fe;p=thirdparty%2Fpdns.git

make sure we can 'make dist' again, including built-in webservice
---

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c00c275cf0..a080685033 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -8,7 +8,7 @@ dnslabeltext.cc: dnslabeltext.rl
 htmlfiles.h: html/*
 	./incfiles > $@
 
-EXTRA_DIST=dnslabeltext.rl dnsdistconf.lua README.md
+EXTRA_DIST=dnslabeltext.rl dnsdistconf.lua README.md html
 
 bin_PROGRAMS = dnsdist
 dnsdist_SOURCES = \
@@ -25,13 +25,16 @@ dnsdist_SOURCES = \
 	dolog.hh \
 	iputils.cc iputils.hh \
 	misc.cc misc.hh \
+	htmlfiles.h \
 	namespaces.hh \
 	pdnsexception.hh \
 	qtype.cc qtype.hh \
 	sholder.hh \
 	sodcrypto.cc sodcrypto.hh \
 	sstuff.hh pdns/ext/luawrapper/include/LuaContext.hpp \
-	pdns/ext/json11/json11.cpp 
+	pdns/ext/json11/json11.cpp \
+	pdns/ext/json11/json11.hpp \
+	pdns/ext/incbin/incbin.h
 
 dnsdist_LDFLAGS = \
 	$(AM_LDFLAGS) \
diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index 17cf3f2a01..d0f2f58a15 100755
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -15,7 +15,9 @@ mkdir -p pdns/ext/json11
 ln -sf ../../../../../ext/luawrapper/include/LuaContext.hpp pdns/ext/luawrapper/include
 ln -sf ../../../../ext/yahttp/Makefile.am pdns/ext/yahttp
 ln -sf ../../../../ext/json11/json11.{hpp,cpp} pdns/ext/json11
-cd pdns/ext/yahttp/yahttp
+cd pdns/ext/yahttp/
+ln -sf ../../../../ext/yahttp/{LICENSE,README.md} .
+cd yahttp
 ln -sf ../../../../../ext/yahttp/yahttp/{Makefile.am,*.cpp,*.hpp,*.h} .
 cd -