[icinga-checkins] icinga.org: icinga2/master: Documentation: implement make target for asciidoc generation

git at icinga.org git at icinga.org
Tue Feb 5 16:32:37 CET 2013


Module: icinga2
Branch: master
Commit: 7d780d5d3d4baa668e6b45cf770d68718280643f
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=7d780d5d3d4baa668e6b45cf770d68718280643f

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Feb  5 16:30:34 2013 +0100

Documentation: implement make target for asciidoc generation

Fixes #3230

---

 Makefile.am      |    9 +++------
 docs/Makefile.am |   14 +++++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6252316..a048ff8 100644
--- 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 2f691f8..5ef6a68 100644
--- 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 $^





More information about the icinga-checkins mailing list