removed old rules for generating manuals

10 files changed, 10 insertions, 165 deletions

diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index e96ec9e7b3..290a558c05 100644
--- a/src/bin/admin/Makefile.am
+++ b/src/bin/admin/Makefile.am
@@ -3,22 +3,9 @@ SUBDIRS = . tests
 # Install kea-admin in sbin.
 sbin_SCRIPTS  = kea-admin
 
-man_MANS = kea-admin.8
-DISTCLEANFILES = $(sbin_SCRIPTS) $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-admin.xml admin-utils.sh
+DISTCLEANFILES = $(sbin_SCRIPTS)
+EXTRA_DIST = admin-utils.sh
 
-if GENERATE_DOCS
-
-kea-admin.8: kea-admin.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 adminscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts
 adminscripts_DATA = admin-utils.sh
diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index c9ec900515..bdb86cd89e 100644
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -11,24 +11,8 @@ endif
 
 CLEANFILES  = *.gcno *.gcda
 
-man_MANS = kea-ctrl-agent.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-ctrl-agent.xml
-EXTRA_DIST += agent.dox agent_hooks.dox
+EXTRA_DIST = agent.dox agent_hooks.dox
 
-if GENERATE_DOCS
-kea-ctrl-agent.8: kea-ctrl-agent.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-ctrl-agent.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 # convenience archive
 
diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index e2f972353f..03b906f6eb 100644
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -12,9 +12,7 @@ endif
 
 CLEANFILES  = *.gcno *.gcda
 
-man_MANS = kea-dhcp-ddns.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-dhcp-ddns.xml d2.dox
+EXTRA_DIST = d2.dox
 EXTRA_DIST += d2_parser.yy
 
 EXTRA_DIST += images/abstract_app_classes.svg images/add_state_model.svg
@@ -25,19 +23,6 @@ EXTRA_DIST += images/nc_trans_sequence.svg images/remove_state_model.svg
 EXTRA_DIST += images/request_mgt_classes.svg images/state_model_classes.svg
 EXTRA_DIST += images/trans_classes.svg images/update_exec_classes.svg
 
-if GENERATE_DOCS
-kea-dhcp-ddns.8: kea-dhcp-ddns.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-dhcp-ddns.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 # convenience archive
 
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 23f2d0ccb9..28f6194411 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -22,25 +22,9 @@ endif
 
 CLEANFILES  = *.gcno *.gcda
 
-man_MANS = kea-dhcp4.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-dhcp4.xml
-EXTRA_DIST += dhcp4.dox dhcp4_hooks.dox dhcp4o6.dox
+EXTRA_DIST = dhcp4.dox dhcp4_hooks.dox dhcp4o6.dox
 EXTRA_DIST += dhcp4_parser.yy
 
-if GENERATE_DOCS
-kea-dhcp4.8: kea-dhcp4.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-dhcp4.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 # convenience archive
 
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 4730182bf2..88e184dc36 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -20,26 +20,9 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-man_MANS = kea-dhcp6.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-dhcp6.xml
-EXTRA_DIST += dhcp6.dox dhcp6_hooks.dox dhcp4o6.dox
+EXTRA_DIST = dhcp6.dox dhcp6_hooks.dox dhcp4o6.dox
 EXTRA_DIST += dhcp6_parser.yy
 
-if GENERATE_DOCS
-
-kea-dhcp6.8: kea-dhcp6.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-	http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-dhcp6.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 # convenience archive
 
diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index f8a1d569e4..791363ca11 100644
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -13,31 +13,16 @@ endif
 
 CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
-man_MANS = keactrl.8
-DISTCLEANFILES = keactrl keactrl.conf $(man_MANS)
+DISTCLEANFILES = keactrl keactrl.conf
 CLEANFILES = $(KEA_CONFIGFILES)
 EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
              kea-dhcp6.conf.pre kea-dhcp-ddns.conf.pre \
-             kea-ctrl-agent.conf.pre kea-netconf.conf.pre \
-             $(man_MANS) keactrl.xml
+             kea-ctrl-agent.conf.pre kea-netconf.conf.pre
 
 # *.conf files are not really sources used for building other targets, but we need
 # these files to be generated before make install is called.
 BUILT_SOURCES = $(KEA_CONFIGFILES)
 
-if GENERATE_DOCS
-
-keactrl.8: keactrl.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 kea-dhcp4.conf: kea-dhcp4.conf.pre
 	$(top_builddir)/tools/path_replacer.sh \
diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index 460f83e3dc..dd90f66faf 100644
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -9,23 +9,8 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-man_MANS = kea-lfc.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-lfc.xml lfc.dox
+EXTRA_DIST = lfc.dox
 
-if GENERATE_DOCS
-kea-lfc.8: kea-lfc.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-lfc.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 # convenience archive
 
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 308a578904..4dab196f0c 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -13,25 +13,8 @@ endif
 
 CLEANFILES  = *.gcno *.gcda
 
-man_MANS = kea-netconf.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-netconf.xml
 #EXTRA_DIST += netconf.dox netconf_hooks.dox
 
-if GENERATE_DOCS
-kea-netconf.8: kea-netconf.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-netconf.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
-
 # convenience archive
 
 noinst_LTLIBRARIES = libnetconf.la
@@ -54,7 +37,7 @@ libnetconf_la_SOURCES += location.hh position.hh stack.hh
 libnetconf_la_SOURCES += netconf_lexer.ll netconf_parser.yy
 libnetconf_la_SOURCES += netconf_messages.h netconf_messages.cc
 
-EXTRA_DIST += netconf_messages.mes
+EXTRA_DIST = netconf_messages.mes
 EXTRA_DIST += netconf_lexer.ll
 EXTRA_DIST += netconf_parser.yy
 
diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index 973ff3e581..eafe2cfb99 100644
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -56,19 +56,3 @@ perfdhcp_LDADD += $(PTHREAD_LDFLAGS)
 # ... and the documentation
 EXTRA_DIST = perfdhcp_internals.dox
 
-man_MANS = perfdhcp.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST += $(man_MANS) perfdhcp.xml
-
-if GENERATE_DOCS
-
-perfdhcp.8: perfdhcp.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am
index 021d8d2be3..a921678305 100644
--- a/src/bin/shell/Makefile.am
+++ b/src/bin/shell/Makefile.am
@@ -8,21 +8,6 @@ CLEANFILES = *.pyc
 
 man_MANS = kea-shell.8
 DISTCLEANFILES = $(sbin_SCRIPTS) $(man_MANS)
-EXTRA_DIST = $(man_MANS) kea-shell.xml
-
-if GENERATE_DOCS
-kea-shell.8: kea-shell.xml
-	@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
-        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-	$(srcdir)/kea-shell.xml
-
-else
-
-$(man_MANS):
-	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-generate-docs to enable it.
-	@echo Man generation disabled.  Remove this file, configure with --enable-generate-docs, and rebuild Kea > $@
-
-endif
 
 CLEANDIRS = __pycache__