X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=4c26a9d472612a6d92ebff26a2120fb2dbcb35a5;hp=0139f95e82e0eb268e96742cc637f8cc8b46a670;hb=0cf39f2d5178f624161b8c4329140bd00b06019c;hpb=6a1b0fb170c7d66559935a6a4f8ee0e2bfdbf485

diff --git a/Makefile.am b/Makefile.am
index 0139f95e..4c26a9d4 100644
--- 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    " $@;
@@ -173,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 \
@@ -193,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
@@ -301,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
 
@@ -310,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
 
@@ -446,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 \
@@ -467,8 +474,13 @@ MANPAGES = \
 	man/network-zone-pppoe.8 \
 	man/network-zone-wireless.8
 
-MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
+EXTRA_DIST += \
+	man/include-color.txt \
+	man/include-description.txt
+
+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,16 +488,14 @@ man: $(MANPAGES) $(MANPAGES_HTML)
 man_MANS = \
 	$(MANPAGES)
 
-noinst_DATA += \
-	$(MANPAGES_HTML)
-
 CLEANFILES += \
 	$(man_MANS) \
-	$(MANPAGES_HTML)
+	$(MANPAGES_HTML) \
+	$(MANPAGES_XML)
 
 EXTRA_DIST += \
-	$(MANPAGES_XML) \
-	man/custom-html.xsl
+	man/asciidoc.conf \
+	$(MANPAGES_TXT)
 
 XSLTPROC_FLAGS = \
 	--nonet \
@@ -496,17 +506,28 @@ XSLTPROC_FLAGS = \
 	--stringparam man.copyright.section.enabled 1
 
 XSLTPROC_COMMAND_MAN = \
-	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
+	$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
+	$(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)$(MKDIR_P) $(dir $@) && \
+	$(ASCIIDOC) \
+		-f $(abs_srcdir)/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)$(MKDIR_P) $(dir $@) && \
+	$(ASCIIDOC) \
+		-f $(abs_srcdir)/man/asciidoc.conf \
+		-b html5 -a icons -a theme=flask -o $@ $<
+
+.PHONY: upload-man
+upload-man: $(MANPAGES_HTML)
+	rsync -avHz --delete --progress $(MANPAGES_HTML) ms@people.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/
 
 # ------------------------------------------------------------------------------