Import CODING_STYLE

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

diff --git a/Makefile.am b/Makefile.am
index 3f558503ad2c4c99430a6d8bce0fac089d3cdb98..6af5391fc7e9c4034fb1986b6266b5550265762a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,8 +81,9 @@ AM_V_XSLT_0 = @echo "  XSLT    " $@;
 # ------------------------------------------------------------------------------
 
 dist_doc_DATA = \
-       COPYING \
-       README
+       README \
+       docs/CODING_STYLE \
+       docs/COPYING
 
 dist_sbin_SCRIPTS = \
        src/dhclient-script \
@@ -114,12 +115,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 \
@@ -194,10 +197,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
 
@@ -211,7 +213,6 @@ 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/bridge \
        src/hooks/zones/modem \
@@ -332,6 +333,8 @@ 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 \
@@ -341,9 +344,9 @@ MANPAGES = \
        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-bridge.8 \
        man/network-zone-config-pppoe-server.8 \
@@ -431,19 +434,25 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
-       topdir="$(shell pwd)" \
-       networkdir="$(top_srcdir)/src/functions" \
-       testdir="$(top_srcdir)/test"
+       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/functions/ip/ip_is_valid \
-       test/functions/ip/ip_is_network \
        test/functions/ip/ip_detect_protocol \
-       test/functions/ip/ip_protocol_is_supported \
        test/functions/ip/ip_get_prefix \
-       test/functions/ip/ip_split_prefix \
-       test/functions/ip/ip_prefix_is_valid
+       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