projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: move warning to end of output for the end user
[lttng-tools.git]
/
doc
/
man
/
Makefile.am
diff --git
a/doc/man/Makefile.am
b/doc/man/Makefile.am
index 840a9c51d0fdbba54e61853845862537b9b621dd..845e475dd4e82c0c73fccc2927a76da7bd7ec756 100644
(file)
--- 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-disable-channel \
lttng-add-context \
lttng-list \
- lttng-calibrate \
lttng-track \
lttng-untrack \
lttng-status \
lttng-track \
lttng-untrack \
lttng-status \
@@
-30,7
+29,8
@@
MAN1_NAMES = \
lttng-enable-event \
lttng-disable-event \
lttng-crash \
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 =
MAN3_NAMES =
MAN8_NAMES = lttng-sessiond lttng-relayd
MAN1_NO_ASCIIDOC_NAMES =
@@
-53,6
+53,7
@@
COMMON_TXT = \
# config
ASCIIDOC_CONF = $(srcdir)/asciidoc.conf
# config
ASCIIDOC_CONF = $(srcdir)/asciidoc.conf
+ASCIIDOC_ATTRS_CONF = $(builddir)/asciidoc-attrs.conf
XSL_FILES = \
manpage.xsl \
manpage-callouts.xsl \
XSL_FILES = \
manpage.xsl \
manpage-callouts.xsl \
@@
-76,11
+77,15
@@
if MAN_PAGES_OPT
# at this point, we know the user asked to build the man pages
if HAVE_ASCIIDOC_XMLTO
# tools
# 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)"
+ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -f $(ASCIIDOC_ATTRS_CONF) -d manpage
ADOC_DOCBOOK = $(ADOC) -b docbook
XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
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 $@ $<
# recipes
%.1.xml: $(srcdir)/%.1.txt $(COMMON_DEPS)
$(ADOC_DOCBOOK) -o $@ $<
@@
-134,5
+139,12
@@
dist_man3_MANS += $(MAN3)
dist_man8_MANS += $(MAN8)
endif # MAN_PAGES_OPT
dist_man8_MANS += $(MAN8)
endif # MAN_PAGES_OPT
+if !MAN_PAGES_OPT
+dist-hook:
+ @echo "Error: Please enable the man pages before creating a distribution tarball."
+ @false
+endif # !MAN_PAGES_OPT
+
# always distribute the source files
# 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
This page took
0.0355 seconds
and
4
git commands to generate.