[#1945] fix building docs from tarball

- Move tools/* EXTRA_DISTs inside tools/Makefile.am because that's where
  they belong.
- Add check-messages.py to EXTRA_DIST in tools/Makefile.am to allow
  someone who downloads the tarball to regenerate the entire message
  documentation just like before.
- Add debug-messages.rst and kea-messages.rst to the tarball so that
  they are not forced to use check-messages.py to regenerate message
  documentation.
- Add singlehtml to all rule. It is the only type of docs that are not
  built by default.

diff --git a/Makefile.am b/Makefile.am
index 8f5b85bf693f33d9c61f28ab12a35cd919754147..bf891b487d4e0318fe335636ac16311e2533955d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,11 +180,8 @@ install-exec-hook:
        mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
        mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
-EXTRA_DIST  = tools/path_replacer.sh
-EXTRA_DIST += tools/mk_cfgrpt.sh
-
 #### include external sources in the distributed tarball:
-EXTRA_DIST += ext/coroutine/coroutine.hpp
+EXTRA_DIST = ext/coroutine/coroutine.hpp
 
 CLEANFILES = $(abs_top_builddir)/logger_lockfile
 

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index d60332974fec05023be073e690806a4f64cd61b6..e7f9d8ea508072338c37d7350568fa6788562057 100644 (file)
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -22,6 +22,9 @@ rst_arm_sources =
 rst_arm_sources += index.rst
 rst_arm_sources += manpages.rst
 rst_arm_sources += umls.rst
+rst_arm_sources += debug-messages.rst
+rst_arm_sources += kea-messages.rst
+
 include arm/rst_arm_sources.mk
 
 EXTRA_DIST += arm/rst_arm_sources.mk
@@ -61,9 +64,9 @@ api_files =
 include $(top_srcdir)/src/share/api/api_files.mk
 
 if HAVE_PDFLATEX
-all: debug-messages.rst kea-messages.rst html mans pdf text
+all: debug-messages.rst kea-messages.rst html mans pdf singlehtml text
 else
-all: debug-messages.rst kea-messages.rst html mans text
+all: debug-messages.rst kea-messages.rst html mans singlehtml text
 endif
 
 # build the list of message files
@@ -85,6 +88,9 @@ $(srcdir)/kea-messages.rst: mes2doc.py
 api-files.txt: $(top_srcdir)/src/share/api/api_files.mk
        @sed 's;api_files .*)/;;' $< > $@
 
+EXTRA_DIST += debug-messages.rst
+EXTRA_DIST += kea-messages.rst
+
 # some tools do not use this makefile but still need generate files.
 EXTRA_DIST += mes-files.txt api-files.txt
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b9a9927359a6ce927918deccda82ffc4fbbe578..2766f4249404839683a7756bcfc73a6e794be31f 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,5 +6,10 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
+EXTRA_DIST  =
+EXTRA_DIST += check-messages.py
+EXTRA_DIST += mk_cfgrpt.sh
+EXTRA_DIST += path_replacer.sh
+
 CLEANFILES = *.gcno *.gcda
 DISTCLEANFILES = path_replacer.sh