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

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c00c275cf04a09b14644cb00f947a038fc479d01..a08068503395625bd4b644fce4e372cbc5a843c3 100644 (file)
--- 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 17cf3f2a013b9b05fce2d52fc3bb099a43e2609d..d0f2f58a15cd74e09e6135590324be3bc0e43b22 100755 (executable)
--- 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 -