Commit 695668a2 authored by Michal Nowikowski's avatar Michal Nowikowski

removed old rules for generating manuals

parent 01fb9fd3
......@@ -1439,7 +1439,6 @@ AC_ARG_ENABLE(generate_docs, [AC_HELP_STRING([--enable-generate-docs],
enable_generate_docs=$enableval, enable_generate_docs=no)
if test "x$enable_generate_docs" != xno ; then
# Check for sphinx-build
AC_PATH_PROG([SPHINXBUILD], [sphinx-build])
if test -z "$SPHINXBUILD"; then
......@@ -1454,43 +1453,8 @@ if test "x$enable_generate_docs" != xno ; then
fi
AC_MSG_RESULT(yes (found in $SPHINXBUILD))
fi
## xsltproc --nonet parameter
# NONET="--nonet"
# AC_ARG_VAR(XSLTPROC_NET, [xsltproc uses the Internet to fetch DTDs, entities or documents.])
# if test "x$XSLTPROC_NET" != x ; then
# NONET=
# fi
# AC_SUBST(NONET)
# Check for xsltproc
# AC_PATH_PROG([XSLTPROC], [xsltproc])
# if test -z "$XSLTPROC"; then
# AC_MSG_ERROR("xsltproc not found; it is required for --enable-generate-docs")
# else
# AC_MSG_CHECKING([if $XSLTPROC works])
# # run xsltproc to see if works
# $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
# if test $? -ne 0 ; then
# AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl")
# fi
# $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
# if test $? -ne 0 ; then
# AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/html/docbook.xsl")
# fi
# AC_MSG_RESULT(yes)
# fi
# AC_PATH_PROG([ELINKS], [elinks])
# if test -z "$ELINKS"; then
# AC_MSG_ERROR("elinks not found; it is required for --enable-generate-docs")
# fi
fi
# Don't fail here if not found, used to generate PDF documentation.
#AC_PATH_PROG([DBLATEX], [dblatex])
#AM_CONDITIONAL(HAVE_DBLATEX, test "x$DBLATEX" != "x")
AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno)
AC_ARG_ENABLE(install-configurations,
......
......@@ -13,8 +13,8 @@ all: devel
devel:
mkdir -p $(builddir)/html
(cat Doxyfile; echo PROJECT_NUMBER=$(PACKAGE_VERSION)) | doxygen - > $(builddir)/html/doxygen.log 2> $(builddir)/html/doxygen-error.log
(cat $(srcdir)/Doxyfile; echo PROJECT_NUMBER=$(PACKAGE_VERSION)) | doxygen - > $(builddir)/html/doxygen.log 2> $(builddir)/html/doxygen-error.log
echo `grep -i ": warning:" $(builddir)/html/doxygen-error.log | wc -l` warnings/errors detected.
clean:
clean-local:
rm -rf html
......@@ -117,7 +117,7 @@ mes_files+=$(top_srcdir)/src/bin/netconf/netconf_messages.mes
all: pdf html mans
kea-messages.rst: $(mes_files) system_messages.py
./system_messages.py -o $@ $(mes_files)
$(srcdir)/system_messages.py -o $@ $(mes_files)
pdf: $(main_sources)
......@@ -142,9 +142,9 @@ install-data-local:
uninstall-local:
rm -rf $(DESTDIR)$(docdir)
clean::
-rm -rf $(sphinxbuilddir)
clean-local:
rm -rf $(sphinxbuilddir)
rm -f kea-messages.rst
.PHONY: all pdf html mans
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -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__
......
/path_replacer.sh
/system_messages
......@@ -11,15 +11,9 @@ DISTCLEANFILES = path_replacer.sh
if GENERATE_DOCS
noinst_PROGRAMS = system_messages
system_messages_SOURCES = system_messages.cc
# For bare distcheck
EXTRA_DIST = system_messages
# Scripts for Cassandra support. Ultimately those scripts will have to be
# incorporated in DataStax cpp-driver source tree, but until that happens,
# let's keep them in Kea rpo
EXTRA_DIST += cql_config cql_config_defines.sh.sample
EXTRA_DIST = cql_config cql_config_defines.sh.sample
endif
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment