X-Git-Url: http://git.ipfire.org/?p=people%2Fstevee%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=94dfc75e0100a19f78d4cce0a73416b09f7039c7;hp=8914ca38ad96ed174adea20b655c103ca1f3afe5;hb=162ae29d6f5c7dea4033b3d094556fde7acb3c0b;hpb=1beade745e5cff8e8e597c5ed645aab7e09d905b

diff --git a/Makefile.am b/Makefile.am
index 8914ca38..94dfc75e 100644
--- 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
@@ -41,9 +42,12 @@ helpersdir       = $(networkdir)/helpers
 macrosdir        = $(libexecdir)/firewall/macros
 
 hooksdir         = $(networkdir)/hooks
+hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
+triggersdir      = $(networkdir)/triggers
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -118,18 +122,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 \
@@ -141,10 +144,10 @@ 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.switch \
 	src/functions/functions.sysctl \
-	src/functions/functions.teredo \
+	src/functions/functions.triggers \
 	src/functions/functions.usb \
 	src/functions/functions.util \
 	src/functions/functions.vlan \
@@ -160,18 +163,17 @@ dist_network_SCRIPTS = \
 	src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
+	src/helpers/aiccu \
 	src/helpers/aiccu-config-helper \
 	src/helpers/bridge-stp \
 	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
 
-bridge-stp-install-hook:
+bridge-stp-install-hook: bridge-stp-uninstall-hook
 	ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/
 
 bridge-stp-uninstall-hook:
@@ -180,14 +182,21 @@ 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/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 = \
@@ -195,13 +204,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/switch \
-	src/hooks/zones/teredo \
 	src/hooks/zones/wireless
 
 # ------------------------------------------------------------------------------
@@ -263,6 +267,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+	src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
 	src/tmpfiles/network
 
@@ -304,23 +313,27 @@ dist_macros_DATA = \
 
 # ------------------------------------------------------------------------------
 
+INSTALL_DIRS += \
+	$(triggersdir)
+
+# ------------------------------------------------------------------------------
+
 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 \
 	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))
@@ -372,7 +385,8 @@ substitutions = \
 	'|prefix=$(prefix)|' \
 	'|exec_prefix=$(exec_prefix)|' \
 	'|sbindir=$(sbindir)|' \
-	'|networkdir=$(networkdir)|'
+	'|networkdir=$(networkdir)|' \
+	'|helpersdir=$(helpersdir)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \