X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fman%2FMakefile.am;h=2258890f018b07c2fdbd8748f33f137ac817affd;hb=4fc83d948cea6b10484e65f004a6c167e71ac440;hp=3cd3effc668723ca75e38ca9c0e75fc7387bfe94;hpb=d8065e7e94081601a74cee5b6accb311211a3f6b;p=lttng-tools.git

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 3cd3effc6..2258890f0 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -21,7 +21,6 @@ MAN1_NAMES = \
 	lttng-disable-channel \
 	lttng-add-context \
 	lttng-list \
-	lttng-calibrate \
 	lttng-track \
 	lttng-untrack \
 	lttng-status \
@@ -30,7 +29,8 @@ MAN1_NAMES = \
 	lttng-enable-event \
 	lttng-disable-event \
 	lttng-crash \
-	lttng-metadata
+	lttng-metadata \
+	lttng-regenerate
 MAN3_NAMES =
 MAN8_NAMES = lttng-sessiond lttng-relayd
 MAN1_NO_ASCIIDOC_NAMES =
@@ -53,6 +53,7 @@ COMMON_TXT = \
 
 # config
 ASCIIDOC_CONF = $(srcdir)/asciidoc.conf
+ASCIIDOC_ATTRS_CONF = $(builddir)/asciidoc-attrs.conf
 XSL_FILES = \
 	manpage.xsl \
 	manpage-callouts.xsl \
@@ -72,17 +73,47 @@ MAN3_NO_ASCIIDOC = $(addsuffix .3,$(MAN3_NO_ASCIIDOC_NAMES))
 MAN8_NO_ASCIIDOC = $(addsuffix .8,$(MAN8_NO_ASCIIDOC_NAMES))
 MAN = $(MAN1) $(MAN3) $(MAN8)
 
+# initially empty
+CLEANFILES =
+
+if EMBED_HELP
+MAN1_H = $(addsuffix .1.h,$(MAN1_NAMES))
+MAN3_H = $(addsuffix .3.h,$(MAN3_NAMES))
+MAN8_H = $(addsuffix .8.h,$(MAN8_NAMES))
+MAN_H = $(MAN1_H) $(MAN3_H) $(MAN8_H)
+MAN_H_RECIPE = \
+	MANWIDTH=80 @MANPROG@ --encoding=UTF-8 --no-hyphenation --no-justification --local-file $< > $@ ; \
+	$(SED) -i 's/\\/\\\\/g' $@ ; \
+	$(SED) -i 's/"/\\"/g' $@ ; \
+	$(SED) -i 's/^\(.*\)$$/"\1\\n"/' $@
+
+%.1.h: %.1
+	$(MAN_H_RECIPE)
+
+%.3.h: %.3
+	$(MAN_H_RECIPE)
+
+%.8.h: %.8
+	$(MAN_H_RECIPE)
+
+all-local: $(MAN_H)
+
+CLEANFILES += $(MAN_H)
+endif # EMBED_HELP
+
 if MAN_PAGES_OPT
 # at this point, we know the user asked to build the man pages
 if HAVE_ASCIIDOC_XMLTO
 # tools
-ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \
-	-a lttng_version="$(PACKAGE_VERSION)" \
-	-a system_sessions_dir="$(sysconfdir)/lttng/sessions" \
-	-a system_lttng_conf="$(sysconfdir)/lttng/lttng.conf"
+ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -f $(ASCIIDOC_ATTRS_CONF) -d manpage
 ADOC_DOCBOOK = $(ADOC) -b docbook
 XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
 
+# only add this dependency if we can build the man pages because it's
+# a file generated by the configure script, so it's more recent than
+# the pregenerated man pages in a tarball
+COMMON_DEPS += $(ASCIIDOC_ATTRS_CONF)
+
 # recipes
 %.1.xml: $(srcdir)/%.1.txt $(COMMON_DEPS)
 	$(ADOC_DOCBOOK) -o $@ $<
@@ -103,7 +134,7 @@ XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
 	$(XTO) $<
 
 # only clean the generated files if we have the tools to generate them again
-CLEANFILES = $(MAN_XML) $(MAN)
+CLEANFILES += $(MAN_XML) $(MAN)
 else # HAVE_ASCIIDOC_XMLTO
 # create man page targets used to stop the build if we want to
 # build the man pages, but we don't have the necessary tools to do so
@@ -143,4 +174,8 @@ dist-hook:
 endif # !MAN_PAGES_OPT
 
 # always distribute the source files
-EXTRA_DIST = $(MAN_TXT) $(COMMON_TXT) $(XSL_SRC_FILES) $(ASCIIDOC_CONF)
+EXTRA_DIST = $(MAN_TXT) $(COMMON_TXT) $(XSL_SRC_FILES) \
+	$(ASCIIDOC_CONF) $(ASCIIDOC_ATTRS_CONF).in
+
+# keep generated man pages that can be considered intermediate files
+.PRECIOUS: %.1 %.3 %.8