pppoe: Enable PD by default

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

diff --git a/Makefile.am b/Makefile.am
index d4dfc3d19528c5afedd34c766b9ed4d99932c4ad..5d8a6ed32f2992915d7a9df828fc27534593c256 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,18 +120,17 @@ 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 \
        src/functions/functions.ip-tunnel \
        src/functions/functions.ipv4 \
        src/functions/functions.ipv6 \
-       src/functions/functions.isdn \
        src/functions/functions.list \
        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 \
@@ -145,7 +145,6 @@ dist_network_SCRIPTS = \
        src/functions/functions.settings \
        src/functions/functions.stp \
        src/functions/functions.sysctl \
-       src/functions/functions.teredo \
        src/functions/functions.usb \
        src/functions/functions.util \
        src/functions/functions.vlan \
@@ -166,8 +165,6 @@ dist_helpers_SCRIPTS = \
        src/helpers/dhcpd-config-helper \
        src/helpers/firewall-kernel-init \
        src/helpers/hostapd-config-helper \
-       src/helpers/miredo-config-helper \
-       src/helpers/miredo-helper \
        src/helpers/pppd-angel \
        src/helpers/wpa_supplicant \
        src/helpers/wpa_supplicant-config-helper
@@ -189,12 +186,11 @@ dist_hooks_configs_SCRIPTS = \
 
 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 = \
@@ -202,12 +198,8 @@ dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/6to4-tunnel \
        src/hooks/zones/aiccu \
        src/hooks/zones/bridge \
-       src/hooks/zones/isdn \
-       src/hooks/zones/isdn-server \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
-       src/hooks/zones/pptp \
-       src/hooks/zones/teredo \
        src/hooks/zones/wireless
 
 # ------------------------------------------------------------------------------
@@ -269,6 +261,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+       src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
        src/tmpfiles/network
 
@@ -325,8 +322,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))