Documentation: implement make target for asciidoc generation

Fixes #3230

diff --git a/Makefile.am b/Makefile.am
index 625231656b85b00ba5cf635811365bf7dc79dd83..a048ff8b440a94a9b0fc397d14b71685bb81c8b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,9 @@ SUBDIRS = \
        icinga-app \
        test \
        itl \
-       etc
+       etc \
+       docs
+
 #doc
 icinga2docdir = ${docdir}
 icinga2doc_DATA = \
@@ -79,8 +81,3 @@ dist-hook: icinga-version.stamp
                $(SED) -e 's|^#undef GIT_IS_DIST.*|#define GIT_IS_DIST 1|' \
                        "icinga-version.h" > "$(distdir)/icinga-version.h"; \
        fi
-
-SRC_DOCS = "./docs"
-
-create-docs:
-       cd $(SRC_DOCS) && $(MAKE)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2f691f845326d9fed0a4fed75b9a99599917ec22..5ef6a6855435652768b8b8084fb48d0f32ff018b 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,11 @@
+EXTRA_DIST = \
+       icinga2-config.txt \
+       icinga2-intro.txt
 
-all: create-docs
+icinga2docdir = ${docdir}
+icinga2doc_DATA = \
+       icinga2-config.html \
+       icinga2-intro.html
 
-create-docs:
-       for file in *.txt; \
-       do asciidoc -a toc -a numbered $$file; \
-       done
+%.html: %.txt
+       asciidoc -a toc -a numbered $^