From: Jeremy C. Reed Date: Thu, 2 Aug 2012 22:59:46 +0000 (-0500) Subject: [1687] makefile updates, mostly to generate dummy manpage if not enabled X-Git-Tag: trac2351_base~97^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ed645f5f18fe5a49a4d37a27d84ae1983a628da;p=thirdparty%2Fkea.git [1687] makefile updates, mostly to generate dummy manpage if not enabled --- diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am index 1f0fbbf63f..9a6183f7e6 100644 --- a/src/bin/auth/Makefile.am +++ b/src/bin/auth/Makefile.am @@ -20,6 +20,7 @@ CLEANFILES = *.gcno *.gcda auth.spec spec_config.h CLEANFILES += auth_messages.h auth_messages.cc man_MANS = b10-auth.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-auth.xml if ENABLE_MAN @@ -27,6 +28,12 @@ if ENABLE_MAN b10-auth.8: b10-auth.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-auth.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif auth.spec: auth.spec.pre diff --git a/src/bin/bindctl/Makefile.am b/src/bin/bindctl/Makefile.am index 52a5145c85..1e41345a30 100644 --- a/src/bin/bindctl/Makefile.am +++ b/src/bin/bindctl/Makefile.am @@ -14,11 +14,18 @@ pythondir = $(pyexecdir)/bindctl bindctldir = $(pkgdatadir) CLEANFILES = bindctl bindctl_main.pyc +CLEANFILES += $(man_MANS) if ENABLE_MAN bindctl.1: bindctl.xml - xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml + @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml + +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ endif diff --git a/src/bin/cfgmgr/Makefile.am b/src/bin/cfgmgr/Makefile.am index aee78cf995..99feed564e 100644 --- a/src/bin/cfgmgr/Makefile.am +++ b/src/bin/cfgmgr/Makefile.am @@ -10,12 +10,19 @@ b10_cfgmgrdir = @localstatedir@/@PACKAGE@ #B10_cfgmgr_DATA = man_MANS = b10-cfgmgr.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-cfgmgr.xml if ENABLE_MAN b10-cfgmgr.8: b10-cfgmgr.xml - xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cfgmgr.xml + @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cfgmgr.xml + +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ endif diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am index e302fa6b87..e115366587 100644 --- a/src/bin/cmdctl/Makefile.am +++ b/src/bin/cmdctl/Makefile.am @@ -26,6 +26,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.pyc man_MANS = b10-cmdctl.8 +CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) b10-cmdctl.xml cmdctl_messages.mes if ENABLE_MAN @@ -33,6 +34,12 @@ if ENABLE_MAN b10-cmdctl.8: b10-cmdctl.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif cmdctl.spec: cmdctl.spec.pre diff --git a/src/bin/dbutil/Makefile.am b/src/bin/dbutil/Makefile.am index e05055f8f9..0d1b3666f5 100644 --- a/src/bin/dbutil/Makefile.am +++ b/src/bin/dbutil/Makefile.am @@ -14,12 +14,19 @@ CLEANFILES = b10-dbutil b10-dbutil.pyc CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyc CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyo +CLEANFILES += $(man_MANS) if ENABLE_MAN b10-dbutil.8: b10-dbutil.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-dbutil.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # Define rule to build logging source files from message file diff --git a/src/bin/ddns/Makefile.am b/src/bin/ddns/Makefile.am index 0b014cb1ad..fa2a2ce2f1 100644 --- a/src/bin/ddns/Makefile.am +++ b/src/bin/ddns/Makefile.am @@ -15,7 +15,9 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.pyc EXTRA_DIST = ddns_messages.mes ddns.spec + man_MANS = b10-ddns.8 +CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) b10-ddns.xml if ENABLE_MAN @@ -23,6 +25,12 @@ if ENABLE_MAN b10-ddns.8: b10-ddns.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-ddns.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # Define rule to build logging source files from message file diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index d343633c75..5afffcab30 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -15,6 +15,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@ CLEANFILES = spec_config.h man_MANS = b10-dhcp4.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-dhcp4.xml dhcp4.spec if ENABLE_MAN @@ -22,6 +23,13 @@ b10-dhcp4.8: b10-dhcp4.xml xsltproc --novalid --xinclude --nonet -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/b10-dhcp4.xml + +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif spec_config.h: spec_config.h.pre diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index 16b17eddf8..8cd76196ff 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -16,6 +16,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@ CLEANFILES = spec_config.h man_MANS = b10-dhcp6.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-dhcp6.xml dhcp6.spec if ENABLE_MAN @@ -24,6 +25,13 @@ b10-dhcp6.8: b10-dhcp6.xml xsltproc --novalid --xinclude --nonet -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/b10-dhcp6.xml + +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif spec_config.h: spec_config.h.pre diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am index a8f96c21fe..d9ee9a7e08 100644 --- a/src/bin/host/Makefile.am +++ b/src/bin/host/Makefile.am @@ -17,6 +17,7 @@ b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la man_MANS = b10-host.1 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-host.xml .PHONY: man @@ -27,4 +28,10 @@ man: b10-host.1 b10-host.1: b10-host.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-host.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif diff --git a/src/bin/loadzone/Makefile.am b/src/bin/loadzone/Makefile.am index a235d68bd0..9478b208d5 100644 --- a/src/bin/loadzone/Makefile.am +++ b/src/bin/loadzone/Makefile.am @@ -5,6 +5,7 @@ noinst_SCRIPTS = run_loadzone.sh CLEANFILES = b10-loadzone man_MANS = b10-loadzone.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-loadzone.xml if ENABLE_MAN @@ -12,6 +13,12 @@ if ENABLE_MAN b10-loadzone.8: b10-loadzone.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-loadzone.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif b10-loadzone: b10-loadzone.py diff --git a/src/bin/msgq/Makefile.am b/src/bin/msgq/Makefile.am index 908cab5dfd..6b137ba61f 100644 --- a/src/bin/msgq/Makefile.am +++ b/src/bin/msgq/Makefile.am @@ -7,6 +7,7 @@ pkglibexec_SCRIPTS = b10-msgq CLEANFILES = b10-msgq msgq.pyc man_MANS = b10-msgq.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) msgq.xml if ENABLE_MAN @@ -14,6 +15,12 @@ if ENABLE_MAN b10-msgq.8: msgq.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/msgq.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am index 2bb3768aba..ace01ea48a 100644 --- a/src/bin/resolver/Makefile.am +++ b/src/bin/resolver/Makefile.am @@ -23,6 +23,7 @@ CLEANFILES += resolver.spec spec_config.h CLEANFILES += resolver_messages.cc resolver_messages.h man_MANS = b10-resolver.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-resolver.xml resolver_messages.mes if ENABLE_MAN @@ -30,6 +31,12 @@ if ENABLE_MAN b10-resolver.8: b10-resolver.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-resolver.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif resolver.spec: resolver.spec.pre diff --git a/src/bin/showtech/Makefile.am b/src/bin/showtech/Makefile.am index cc9923c884..ae8118dab9 100644 --- a/src/bin/showtech/Makefile.am +++ b/src/bin/showtech/Makefile.am @@ -12,12 +12,19 @@ MAN1_FILES = \ man_MANS = \ $(MAN1_FILES:.xml=.1) +CLEANFILES += $(man_MANS) if ENABLE_MAN .xml.1: xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif EXTRA_DIST = $(man_MANS) $(MAN1_FILES) diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am index 6ac494f92a..72094f9555 100644 --- a/src/bin/sockcreator/Makefile.am +++ b/src/bin/sockcreator/Makefile.am @@ -13,6 +13,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@ CLEANFILES = *.gcno *.gcda man_MANS = b10-sockcreator.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-sockcreator.xml if ENABLE_MAN @@ -20,6 +21,12 @@ if ENABLE_MAN b10-sockcreator.8: b10-sockcreator.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-sockcreator.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif pkglibexec_PROGRAMS = b10-sockcreator diff --git a/src/bin/stats/Makefile.am b/src/bin/stats/Makefile.am index 63e2a3b38b..60410a69a2 100644 --- a/src/bin/stats/Makefile.am +++ b/src/bin/stats/Makefile.am @@ -20,6 +20,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/stats_httpd_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/stats_httpd_messages.pyc man_MANS = b10-stats.8 b10-stats-httpd.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-stats.xml b10-stats-httpd.xml EXTRA_DIST += stats.spec stats-httpd.spec EXTRA_DIST += stats-httpd-xml.tpl stats-httpd-xsd.tpl stats-httpd-xsl.tpl @@ -33,6 +34,12 @@ b10-stats.8: b10-stats.xml b10-stats-httpd.8: b10-stats-httpd.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-stats-httpd.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif $(PYTHON_LOGMSGPKG_DIR)/work/stats_messages.py : stats_messages.mes diff --git a/src/bin/usermgr/Makefile.am b/src/bin/usermgr/Makefile.am index 7ebb1cd6c2..5f427ace84 100644 --- a/src/bin/usermgr/Makefile.am +++ b/src/bin/usermgr/Makefile.am @@ -5,6 +5,7 @@ b10_cmdctl_usermgrdir = $(pkgdatadir) CLEANFILES= b10-cmdctl-usermgr man_MANS = b10-cmdctl-usermgr.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-cmdctl-usermgr.xml if ENABLE_MAN @@ -12,6 +13,12 @@ if ENABLE_MAN b10-cmdctl-usermgr.8: b10-cmdctl-usermgr.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl-usermgr.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix diff --git a/src/bin/xfrin/Makefile.am b/src/bin/xfrin/Makefile.am index 8d80b220fb..091be9bcdb 100644 --- a/src/bin/xfrin/Makefile.am +++ b/src/bin/xfrin/Makefile.am @@ -15,6 +15,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.pyc man_MANS = b10-xfrin.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-xfrin.xml EXTRA_DIST += xfrin.spec xfrin_messages.mes @@ -23,6 +24,12 @@ if ENABLE_MAN b10-xfrin.8: b10-xfrin.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrin.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # Define rule to build logging source files from message file diff --git a/src/bin/xfrout/Makefile.am b/src/bin/xfrout/Makefile.am index 6100e64bf7..8adec7f73f 100644 --- a/src/bin/xfrout/Makefile.am +++ b/src/bin/xfrout/Makefile.am @@ -15,6 +15,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.pyc man_MANS = b10-xfrout.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-xfrout.xml xfrout_messages.mes if ENABLE_MAN @@ -22,6 +23,12 @@ if ENABLE_MAN b10-xfrout.8: b10-xfrout.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrout.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # Define rule to build logging source files from message file diff --git a/src/bin/zonemgr/Makefile.am b/src/bin/zonemgr/Makefile.am index aa427fdf2e..8244fb6dc9 100644 --- a/src/bin/zonemgr/Makefile.am +++ b/src/bin/zonemgr/Makefile.am @@ -15,6 +15,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.pyc man_MANS = b10-zonemgr.8 +CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-zonemgr.xml zonemgr_messages.mes if ENABLE_MAN @@ -22,6 +23,12 @@ if ENABLE_MAN b10-zonemgr.8: b10-zonemgr.xml xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-zonemgr.xml +else + +$(man_MANS): + @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + endif # Build logging source file from message files