[master] 1cebffd dont try to build documentation for tools we cant build
Nils Goroll
nils.goroll at uplex.de
Wed Mar 19 19:15:24 CET 2014
commit 1cebffd4196dcb50f04ec519b0d0b97d8f497f0c
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Mar 19 19:13:00 2014 +0100
dont try to build documentation for tools we cant build
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 716e8da..bb44131 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -197,6 +197,9 @@ include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2r
BUILT_SOURCES += include/varnishlog_options.rst \
include/varnishlog_synopsis.rst
+# tools which only get built when curses is available
+# XXX add varnishstat here when _opt2rst is ready
+if VARNISH_CURSES
include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
$(top_builddir)/bin/varnishtop/varnishtop_opt2rst options > $@
include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
@@ -210,6 +213,8 @@ include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist_op
$(top_builddir)/bin/varnishhist/varnishhist_opt2rst synopsis > $@
BUILT_SOURCES += include/varnishhist_options.rst \
include/varnishhist_synopsis.rst
+endif
+
include/vmod_std.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst
cp $? $@
diff --git a/man/Makefile.am b/man/Makefile.am
index c25804e..ae3e40d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,12 +14,10 @@ dist_man_MANS = \
vsl-query.7 \
varnishadm.1 \
varnishd.1 \
- varnishhist.1 \
varnishlog.1 \
varnishncsa.1 \
varnishstat.1 \
varnishtest.1 \
- varnishtop.1 \
vmod_directors.3 \
vmod_std.3
@@ -71,6 +69,12 @@ varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst
varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst
${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishtest.rst $@
+# tools which only get built when curses is available
+# XXX add varnishstat here when _opt2rst is ready
+if VARNISH_CURSES
+dist_man_MANS += varnishtop.1 \
+ varnishhist.1
+
varnishtop.1: \
$(top_srcdir)/doc/sphinx/reference/varnishtop.rst \
$(top_srcdir)/doc/sphinx/include/varnishtop_options.rst \
@@ -82,6 +86,8 @@ varnishhist.1: \
$(top_srcdir)/doc/sphinx/include/varnishhist_options.rst \
$(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst
${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@
+endif
+
vmod_std.3: $(top_srcdir)/lib/libvmod_std/vmod_std.man.rst
${RST2MAN} $? $@
More information about the varnish-commit
mailing list