[#202, !111] make distcheck fix

Changes proposed by Wlodek Wencel
Signed-off-by: Tomek Mrugalski <tomasz@isc.org>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 951c257a19ccb36fd376575625a4ab5a8713b268..184e3478ac43d7a5e9359a0c187ec7014cc2eb83 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = guide
+SUBDIRS = guide docgen
 
 EXTRA_DIST  = version.ent.in Doxyfile Doxyfile-xml
 EXTRA_DIST += devel/bison.dox

diff --git a/doc/docgen/Makefile.am b/doc/docgen/Makefile.am
index 72d8bd94c67c840222c3fafa7a9907d12ca52662..5b1fcc5a12f5a7520b0cf42861fc0ffa6cb4e0ae 100644 (file)
--- a/doc/docgen/Makefile.am
+++ b/doc/docgen/Makefile.am
@@ -5,14 +5,16 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_STATIC_LINK
 AM_LDFLAGS = -static
+endif
 
 if GENERATE_DOCS
 noinst_PROGRAMS = kea-docgen
 kea_docgen_SOURCES = kea_docgen.cc
 
 # For bare distcheck
-EXTRA_DIST = cmd_docgen
+EXTRA_DIST = cmd_docgen generate-templates
 
 kea_docgen_LDADD = $(top_builddir)/src/lib/cc/libkea-cc.la
 kea_docgen_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la