dhcp: Add support for DHCPv6 over Ethernet

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

diff --git a/Makefile.am b/Makefile.am
index 9ba352f5e1a87e42d8295098d72b05db67e75813..2bb27e2f28cf55d11a892310e97d93d953cff8b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
+bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
 pkgconfigdatadir = $(datadir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
@@ -119,6 +120,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.he \
        src/functions/functions.hook \
        src/functions/functions.hostapd \
+       src/functions/functions.hotplug \
        src/functions/functions.http \
        src/functions/functions.ip \
        src/functions/functions.iptables \
@@ -129,7 +131,6 @@ dist_network_SCRIPTS = \
        src/functions/functions.lock \
        src/functions/functions.logging \
        src/functions/functions.macros \
-       src/functions/functions.macvlan \
        src/functions/functions.modem \
        src/functions/functions.phy \
        src/functions/functions.ports \
@@ -179,18 +180,19 @@ UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
 
 dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/ipv4-dhcp \
-       src/hooks/configs/ipv6-static \
        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
 
 dist_hooks_ports_SCRIPTS = \
        src/hooks/ports/batman-adv \
-       src/hooks/ports/batman-adv-port \
        src/hooks/ports/bonding \
        src/hooks/ports/dummy \
        src/hooks/ports/ethernet \
-       src/hooks/ports/macvlan \
        src/hooks/ports/vlan \
+       src/hooks/ports/wireless-adhoc \
        src/hooks/ports/wireless-ap
 
 dist_hooks_zones_SCRIPTS = \
@@ -200,7 +202,6 @@ dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/bridge \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
-       src/hooks/zones/pptp \
        src/hooks/zones/wireless
 
 # ------------------------------------------------------------------------------
@@ -262,6 +263,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+       src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
        src/tmpfiles/network
 
@@ -318,8 +324,7 @@ MANPAGES = \
        man/network-zone-aiccu.8 \
        man/network-zone-bridge.8 \
        man/network-zone-config-pppoe-server.8 \
-       man/network-zone-pppoe.8 \
-       man/network-zone-pptp.8
+       man/network-zone-pppoe.8
 
 MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
 MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))