]> git.ipfire.org Git - people/ms/network.git/blobdiff - Makefile.am
projects / people / ms / network.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
vlan: Fail when unknown command line parameters are being passed
[people/ms/network.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 30d7faed832394032016dd44e98980c2d0f73923..4c26a9d472612a6d92ebff26a2120fb2dbcb35a5 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 \
@@ -161,16 +166,17 @@ dist_network_DATA = \
        src/functions/functions.ip-tunnel \
        src/functions/functions.ipv4 \
        src/functions/functions.ipv6 \
+       src/functions/functions.leds \
        src/functions/functions.list \
        src/functions/functions.lock \
        src/functions/functions.logging \
        src/functions/functions.macros \
        src/functions/functions.modem \
+       src/functions/functions.offloading \
        src/functions/functions.phy \
        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 \
@@ -190,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
@@ -227,6 +232,7 @@ dist_hooks_ports_SCRIPTS = \
        src/hooks/ports/bonding \
        src/hooks/ports/dummy \
        src/hooks/ports/ethernet \
+       src/hooks/ports/ip-tunnel \
        src/hooks/ports/vlan \
        src/hooks/ports/wireless-ap \
        src/hooks/ports/wireless-mesh
@@ -296,7 +302,22 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 
 util_PROGRAMS = \
-       src/utils/network-phy-list-ht-caps
+       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
+
+src_utils_network_phy_list_channels_SOURCES = \
+       src/utils/network-phy-list-channels.c
+
+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
@@ -304,6 +325,12 @@ src_utils_network_phy_list_ht_caps_SOURCES = \
 src_utils_network_phy_list_ht_caps_LDADD = \
        src/libnetwork.la
 
+src_utils_network_phy_list_vht_caps_SOURCES = \
+       src/utils/network-phy-list-vht-caps.c
+
+src_utils_network_phy_list_vht_caps_LDADD = \
+       src/libnetwork.la
+
 # ------------------------------------------------------------------------------
 
 ppp_SCRIPTS = \
@@ -428,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 \
@@ -449,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)
@@ -458,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 \
@@ -478,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)/
 
 # ------------------------------------------------------------------------------
 
@@ -603,6 +642,8 @@ NITSI_TESTS = \
        test/nitsi/test/raw-device-get-by-mac \
        test/nitsi/test/zone-new-bridge \
        test/nitsi/test/zone-port-attach-bridge \
+       test/nitsi/test/zone/ip-tunnel/gre6 \
+       test/nitsi/test/zone/ip-tunnel/gre4 \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4 \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6 \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4 \
@@ -621,6 +662,10 @@ EXTRA_DIST += \
        test/nitsi/test/zone-new-bridge/settings.in \
        test/nitsi/test/zone-port-attach-bridge/recipe \
        test/nitsi/test/zone-port-attach-bridge/settings.in \
+       test/nitsi/test/zone/ip-tunnel/gre6/recipe \
+       test/nitsi/test/zone/ip-tunnel/gre6/settings \
+       test/nitsi/test/zone/ip-tunnel/gre4/recipe \
+       test/nitsi/test/zone/ip-tunnel/gre4/settings \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings \
        test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe \
Networking code of IPFire 3.x.