wpa_supplicant: Doesn't like spaces here

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

diff --git a/Makefile.am b/Makefile.am
index 6af5391fc7e9c4034fb1986b6266b5550265762a..a39af22aaa5a92440899a01168686043c6de49f9 100644 (file)
--- 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
@@ -104,7 +105,6 @@ EXTRA_DIST += \
 dist_network_SCRIPTS = \
        src/functions/functions.at \
        src/functions/functions.auth \
-       src/functions/functions.batman-adv \
        src/functions/functions.bonding \
        src/functions/functions.bridge \
        src/functions/functions.cli \
@@ -123,7 +123,6 @@ dist_network_SCRIPTS = \
        src/functions/functions.dns \
        src/functions/functions.dummy \
        src/functions/functions.editor \
-       src/functions/functions.ethernet \
        src/functions/functions.firewall \
        src/functions/functions.firewall-policy \
        src/functions/functions.firewall-zones \
@@ -134,6 +133,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 \
@@ -148,7 +149,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 \
@@ -161,7 +161,10 @@ 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.wireless-networks \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
        src/network-radvd-config \
@@ -173,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
@@ -187,15 +189,6 @@ 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/dhcp \
        src/hooks/configs/ipv4-static \
@@ -204,13 +197,12 @@ dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/pppoe-server
 
 dist_hooks_ports_SCRIPTS = \
-       src/hooks/ports/batman-adv \
        src/hooks/ports/bonding \
        src/hooks/ports/dummy \
        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 \
@@ -274,6 +266,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
 
@@ -340,8 +342,6 @@ MANPAGES = \
        man/network-dns-server.8 \
        man/network-performance-tuning.8 \
        man/network-port.8 \
-       man/network-port-batman-adv.8 \
-       man/network-port-batman-adv-port.8 \
        man/network-quick-start.8 \
        man/network-route.8 \
        man/network-route-static.8 \