man: add color documentation

[network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c79cef922d303b697ec83cd322a47aacdd6ac7e1..8b869a80f4f1adcea7ebf7c1e33b0ba4880b6bf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,8 @@ hooks_zonesdir   = $(hooksdir)/zones
 
 triggersdir      = $(networkdir)/triggers
 
+logdir           = $(localestatedir)/log/network
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -99,7 +101,6 @@ EXTRA_DIST += \
        src/functions/functions.in
 
 dist_network_SCRIPTS = \
-       src/functions/functions.aiccu \
        src/functions/functions.at \
        src/functions/functions.auth \
        src/functions/functions.batman-adv \
@@ -113,12 +114,14 @@ dist_network_SCRIPTS = \
        src/functions/functions.constants \
        src/functions/functions.constants-firewall \
        src/functions/functions.db \
+       src/functions/functions.description \
        src/functions/functions.device \
        src/functions/functions.dhclient \
        src/functions/functions.dhcpd \
        src/functions/functions.distro \
        src/functions/functions.dns \
        src/functions/functions.dummy \
+       src/functions/functions.editor \
        src/functions/functions.ethernet \
        src/functions/functions.firewall \
        src/functions/functions.firewall-policy \
@@ -128,6 +131,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.hostapd \
        src/functions/functions.hotplug \
        src/functions/functions.http \
+       src/functions/functions.interrupts \
        src/functions/functions.ip \
        src/functions/functions.iptables \
        src/functions/functions.ip-tunnel \
@@ -151,6 +155,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.settings \
        src/functions/functions.stp \
        src/functions/functions.sysctl \
+       src/functions/functions.system \
        src/functions/functions.triggers \
        src/functions/functions.usb \
        src/functions/functions.util \
@@ -167,8 +172,6 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
-       src/helpers/aiccu \
-       src/helpers/aiccu-config-helper \
        src/helpers/bridge-stp \
        src/helpers/dhcpd-config-helper \
        src/helpers/firewall-kernel-init \
@@ -193,10 +196,9 @@ INSTALL_EXEC_HOOKS += bridge-stp-install-hook
 UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
 
 dist_hooks_configs_SCRIPTS = \
-       src/hooks/configs/ipv4-dhcp \
+       src/hooks/configs/dhcp \
        src/hooks/configs/ipv4-static \
        src/hooks/configs/ipv6-auto \
-       src/hooks/configs/ipv6-dhcp \
        src/hooks/configs/ipv6-static \
        src/hooks/configs/pppoe-server
 
@@ -210,9 +212,7 @@ dist_hooks_ports_SCRIPTS = \
        src/hooks/ports/wireless-ap
 
 dist_hooks_zones_SCRIPTS = \
-       src/hooks/zones/6rd \
        src/hooks/zones/6to4-tunnel \
-       src/hooks/zones/aiccu \
        src/hooks/zones/bridge \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
@@ -230,7 +230,8 @@ EXTRA_DIST += \
        src/ppp/ip-updown.in
 
 INSTALL_DIRS += \
-       $(pppdir)
+       $(pppdir) \
+       $(logdir)
 
 ppp-install-hook:
        ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-pre-up
@@ -283,7 +284,7 @@ dist_bashcompletion_SCRIPTS = \
 # ------------------------------------------------------------------------------
 
 dist_tmpfiles_DATA = \
-       src/tmpfiles/network
+       src/tmpfiles/network.conf
 
 # ------------------------------------------------------------------------------
 
@@ -331,18 +332,20 @@ INSTALL_DIRS += \
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.8 \
+       man/network-color.8 \
        man/network-device.8 \
+       man/network-dhcp.8 \
        man/network-dns-server.8 \
+       man/network-performance-tuning.8 \
        man/network-port.8 \
        man/network-port-batman-adv.8 \
        man/network-port-batman-adv-port.8 \
        man/network-quick-start.8 \
        man/network-route.8 \
+       man/network-route-static.8 \
        man/network-settings.8 \
        man/network-zone.8 \
-       man/network-zone-6rd.8 \
        man/network-zone-6to4-tunnel.8 \
-       man/network-zone-aiccu.8 \
        man/network-zone-bridge.8 \
        man/network-zone-config-pppoe-server.8 \
        man/network-zone-modem.8 \
@@ -429,11 +432,25 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
-       topdir="$(shell pwd)" \
-       networkdir="$(top_srcdir)/src/functions"
+       PATH=$(top_builddir)/src:$(PATH) \
+       functions=$(abs_builddir)/src/functions/functions \
+       networkdir=$(abs_srcdir)/src/functions \
+       testdir=$(top_srcdir)/test
+
+dist_check_DATA = \
+       test/constants.sh \
+       test/test-functions
 
 dist_check_SCRIPTS = \
-       test/load-library
+       $(TESTS)
 
 TESTS = \
-       test/load-library
+       test/load-library \
+       test/functions/ip/ip_detect_protocol \
+       test/functions/ip/ip_get_prefix \
+       test/functions/ip/ip_net_is_valid \
+       test/functions/ip/ip_is_valid \
+       test/functions/ip/ip_network_is_subnet_of \
+       test/functions/ip/ip_prefix_is_valid \
+       test/functions/ip/ip_protocol_is_supported \
+       test/functions/ip/ip_split_prefix