X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=d01e22333f0c851ab5593977a60278102232ce90;hb=8f591cfc10d1876523d608d9643f0a82517c2add;hp=0139f95e82e0eb268e96742cc637f8cc8b46a670;hpb=6a1b0fb170c7d66559935a6a4f8ee0e2bfdbf485;p=network.git

diff --git a/Makefile.am b/Makefile.am
index 0139f95e..d01e2233 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
 
@@ -444,6 +453,7 @@ INSTALL_DIRS += \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
+	man/test.8 \
 	man/firewall-settings.8 \
 	man/network.8 \
 	man/network-color.8 \
@@ -467,8 +477,8 @@ 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))
 
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
@@ -484,7 +494,7 @@ CLEANFILES += \
 	$(MANPAGES_HTML)
 
 EXTRA_DIST += \
-	$(MANPAGES_XML) \
+	$(MANPAGES_TXT) \
 	man/custom-html.xsl
 
 XSLTPROC_FLAGS = \
@@ -502,6 +512,9 @@ XSLTPROC_COMMAND_MAN = \
 XSLTPROC_COMMAND_HTML = \
 	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
+man/%.xml: man/%.txt
+	$(AM_V_ASCIIDOC)$(ASCIIDOC) -d manpage -b docbook -o $@ $<
+
 man/%.8: man/%.xml
 	$(XSLTPROC_COMMAND_MAN)