dhcp: merge hooks ipv4-dhcp and ipv6-dhcp

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

diff --git a/Makefile.am b/Makefile.am
index acf5a718f3b25265f1a291169ca04ceb2256220b..2bbc537861ba468124e523fb7e785d4dc3c0ffa0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,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 \
@@ -194,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
 
@@ -340,6 +341,7 @@ 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-6to4-tunnel.8 \
@@ -445,7 +447,7 @@ TESTS = \
        test/load-library \
        test/functions/ip/ip_detect_protocol \
        test/functions/ip/ip_get_prefix \
-       test/functions/ip/ip_is_network \
+       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 \