X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=60f59607d3214b0fded56046a3209d9f9d543ec8;hb=46954be3e86f6334408eac4d8053938b1bef11a5;hp=b5f78f463776b643fcab2960fa988c1c7adb4cb8;hpb=19331e5f840aa14b7648e80f03bc3379e4710b3c;p=people%2Fstevee%2Fnetwork.git

diff --git a/Makefile.am b/Makefile.am
index b5f78f46..60f59607 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
 pkgconfigdatadir = $(datadir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
+systemconfigdir  = $(datadir)/network
 sysctldir        = $(prefix)/lib/sysctl.d
 tmpfilesdir      = $(prefix)/lib/tmpfiles.d
 udevrulesdir     = $(udevdir)/rules.d
@@ -81,8 +82,9 @@ AM_V_XSLT_0 = @echo "  XSLT    " $@;
 # ------------------------------------------------------------------------------
 
 dist_doc_DATA = \
-	COPYING \
-	README
+	README \
+	docs/CODING_STYLE \
+	docs/COPYING
 
 dist_sbin_SCRIPTS = \
 	src/dhclient-script \
@@ -114,13 +116,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.ethernet \
+	src/functions/functions.editor \
 	src/functions/functions.firewall \
 	src/functions/functions.firewall-policy \
 	src/functions/functions.firewall-zones \
@@ -131,6 +134,8 @@ dist_network_SCRIPTS = \
 	src/functions/functions.http \
 	src/functions/functions.interrupts \
 	src/functions/functions.ip \
+	src/functions/functions.ipsec \
+	src/functions/functions.ipsec-pool \
 	src/functions/functions.iptables \
 	src/functions/functions.ip-tunnel \
 	src/functions/functions.ipv4 \
@@ -145,7 +150,6 @@ dist_network_SCRIPTS = \
 	src/functions/functions.ppp \
 	src/functions/functions.pppoe-server \
 	src/functions/functions.radvd \
-	src/functions/functions.red \
 	src/functions/functions.route \
 	src/functions/functions.routing \
 	src/functions/functions.serial \
@@ -158,6 +162,8 @@ dist_network_SCRIPTS = \
 	src/functions/functions.usb \
 	src/functions/functions.util \
 	src/functions/functions.vlan \
+	src/functions/functions.vpn \
+	src/functions/functions.vpn-security-policies \
 	src/functions/functions.wireless \
 	src/functions/functions.wpa_supplicant \
 	src/functions/functions.zone \
@@ -170,13 +176,12 @@ dist_network_SCRIPTS = \
 	src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
-	src/helpers/bridge-stp \
 	src/helpers/dhcpd-config-helper \
 	src/helpers/firewall-kernel-init \
 	src/helpers/hostapd-config-helper \
+	src/helpers/ipsec-updown \
 	src/helpers/pppd-angel \
-	src/helpers/wpa_supplicant \
-	src/helpers/wpa_supplicant-config-helper
+	src/helpers/wpa_supplicant
 
 bin_PROGRAMS = \
 	src/inetcalc
@@ -184,20 +189,10 @@ bin_PROGRAMS = \
 src_inetcalc_SOURCES = \
 	src/inetcalc.c
 
-bridge-stp-install-hook: bridge-stp-uninstall-hook
-	ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/
-
-bridge-stp-uninstall-hook:
-	rm -f $(DESTDIR)$(sbindir)/bridge-stp
-
-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
 
@@ -208,7 +203,8 @@ dist_hooks_ports_SCRIPTS = \
 	src/hooks/ports/ethernet \
 	src/hooks/ports/vlan \
 	src/hooks/ports/wireless-adhoc \
-	src/hooks/ports/wireless-ap
+	src/hooks/ports/wireless-ap \
+	src/hooks/ports/wireless-mesh
 
 dist_hooks_zones_SCRIPTS = \
 	src/hooks/zones/6to4-tunnel \
@@ -272,6 +268,16 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+systemconfig_vpndir = $(systemconfigdir)/vpn
+
+dist_systemconfig_vpn_security_policies_DATA = \
+	config/vpn/security-policies/performance \
+	config/vpn/security-policies/system
+
+systemconfig_vpn_security_policiesdir = $(systemconfig_vpndir)/security-policies
+
+# ------------------------------------------------------------------------------
+
 dist_sysctl_DATA = \
 	src/sysctl/network.conf
 
@@ -331,6 +337,8 @@ INSTALL_DIRS += \
 MANPAGES = \
 	man/firewall-settings.8 \
 	man/network.8 \
+	man/network-color.8 \
+	man/network-description.8 \
 	man/network-device.8 \
 	man/network-dhcp.8 \
 	man/network-dns-server.8 \
@@ -340,7 +348,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-route-static.8 \
 	man/network-settings.8 \
 	man/network-zone.8 \
 	man/network-zone-6to4-tunnel.8 \