Remove support for ISDN

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

diff --git a/Makefile.am b/Makefile.am
index 2b86f868598304191147d379c0d17c1bc9bf40c5..9ba352f5e1a87e42d8295098d72b05db67e75813 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ helpersdir       = $(networkdir)/helpers
 macrosdir        = $(libexecdir)/firewall/macros
 
 hooksdir         = $(networkdir)/hooks
+hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
@@ -124,7 +125,6 @@ dist_network_SCRIPTS = \
        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 \
@@ -141,9 +141,9 @@ dist_network_SCRIPTS = \
        src/functions/functions.routing \
        src/functions/functions.serial \
        src/functions/functions.service \
+       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 \
@@ -164,8 +164,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
@@ -179,6 +177,12 @@ bridge-stp-uninstall-hook:
 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/ipv6-static \
+       src/hooks/configs/ipv4-static \
+       src/hooks/configs/pppoe-server
+
 dist_hooks_ports_SCRIPTS = \
        src/hooks/ports/batman-adv \
        src/hooks/ports/batman-adv-port \
@@ -194,12 +198,9 @@ 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
 
 # ------------------------------------------------------------------------------
@@ -303,14 +304,14 @@ dist_macros_DATA = \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
-       man/firewall-config.8 \
+       man/firewall-settings.8 \
        man/network.8 \
-       man/network-config.8 \
        man/network-device.8 \
        man/network-dns-server.8 \
        man/network-port-batman-adv.8 \
        man/network-port-batman-adv-port.8 \
        man/network-route.8 \
+       man/network-settings.8 \
        man/network-zone.8 \
        man/network-zone-6rd.8 \
        man/network-zone-6to4-tunnel.8 \
@@ -370,7 +371,8 @@ substitutions = \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
        '|sbindir=$(sbindir)|' \
-       '|networkdir=$(networkdir)|'
+       '|networkdir=$(networkdir)|' \
+       '|helpersdir=$(helpersdir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \