man: Cleanup XML files

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 399652e1fb85c86a43a02dbb2bd0c197b6a06353..d79b0f25e4c4434a9b7051dd981dd56fe9c4cb06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \
 
 # ------------------------------------------------------------------------------
 
+AM_V_ASCIIDOC   = $(AM_V_ASCIIDOC_$(V))
+AM_V_ASCIIDOC_  = $(AM_V_ASCIIDOC_$(AM_DEFAULT_VERBOSITY))
+AM_V_ASCIIDOC_0 = @echo "  ASCIIDOC" $@;
+
 AM_V_DOWNLOAD   = $(AM_V_DOWNLOAD_$(V))
 AM_V_DOWNLOAD_  = $(AM_V_DOWNLOAD_$(AM_DEFAULT_VERBOSITY))
 AM_V_DOWNLOAD_0 = @echo "  LOAD    " $@;
@@ -127,6 +131,7 @@ EXTRA_DIST += \
 dist_network_DATA = \
        src/functions/functions.at \
        src/functions/functions.auth \
+       src/functions/functions.bird \
        src/functions/functions.bonding \
        src/functions/functions.bridge \
        src/functions/functions.cli \
@@ -172,7 +177,6 @@ dist_network_DATA = \
        src/functions/functions.ports \
        src/functions/functions.ppp \
        src/functions/functions.pppoe-server \
-       src/functions/functions.radvd \
        src/functions/functions.route \
        src/functions/functions.routing \
        src/functions/functions.serial \
@@ -192,7 +196,6 @@ dist_network_DATA = \
        src/functions/functions.wireless-networks \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
-       src/network-radvd-config \
        src/header-config \
        src/header-port \
        src/header-zone
@@ -300,6 +303,7 @@ EXTRA_DIST += \
 
 util_PROGRAMS = \
        src/utils/network-phy-list-channels \
+       src/utils/network-phy-list-ciphers \
        src/utils/network-phy-list-ht-caps \
        src/utils/network-phy-list-vht-caps
 
@@ -309,6 +313,12 @@ src_utils_network_phy_list_channels_SOURCES = \
 src_utils_network_phy_list_channels_LDADD = \
        src/libnetwork.la
 
+src_utils_network_phy_list_ciphers_SOURCES = \
+       src/utils/network-phy-list-ciphers.c
+
+src_utils_network_phy_list_ciphers_LDADD = \
+       src/libnetwork.la
+
 src_utils_network_phy_list_ht_caps_SOURCES = \
        src/utils/network-phy-list-ht-caps.c
 
@@ -445,8 +455,6 @@ INSTALL_DIRS += \
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.8 \
-       man/network-color.8 \
-       man/network-description.8 \
        man/network-device.8 \
        man/network-dhcp.8 \
        man/network-dns-server.8 \
@@ -466,8 +474,9 @@ MANPAGES = \
        man/network-zone-pppoe.8 \
        man/network-zone-wireless.8
 
-MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
+MANPAGES_TXT  = $(patsubst %.8,%.txt,$(MANPAGES))
+MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
+MANPAGES_XML  = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
 
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
@@ -476,15 +485,16 @@ man_MANS = \
        $(MANPAGES)
 
 noinst_DATA += \
-       $(MANPAGES_HTML)
+       $(MANPAGES_HTML) \
+       $(MANPAGES_XML)
 
 CLEANFILES += \
        $(man_MANS) \
-       $(MANPAGES_HTML)
+       $(MANPAGES_HTML) \
+       $(MANPAGES_XML)
 
 EXTRA_DIST += \
-       $(MANPAGES_XML) \
-       man/custom-html.xsl
+       $(MANPAGES_TXT)
 
 XSLTPROC_FLAGS = \
        --nonet \
@@ -498,14 +508,18 @@ XSLTPROC_COMMAND_MAN = \
        $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
                http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_COMMAND_HTML = \
-       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+man/%.xml: man/%.txt man/asciidoc.conf
+       $(AM_V_ASCIIDOC)$(ASCIIDOC) \
+               -f man/asciidoc.conf \
+               -d manpage -b docbook -o $@ $<
 
 man/%.8: man/%.xml
        $(XSLTPROC_COMMAND_MAN)
 
-man/%.html: man/%.xml man/custom-html.xsl
-       $(XSLTPROC_COMMAND_HTML)
+man/%.html: man/%.txt man/asciidoc.conf
+       $(AM_V_ASCIIDOC)$(ASCIIDOC) \
+               -f man/asciidoc.conf \
+               -b html5 -a icons -a theme=flask -o $@ $<
 
 # ------------------------------------------------------------------------------