]> git.ipfire.org Git - people/stevee/network.git/blobdiff - Makefile.am
projects / people / stevee / network.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wpa_supplicant: Doesn't like spaces here
[people/stevee/network.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2f1c8922905eda7648836353dbc0986f31d00a5e..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
@@ -48,6 +49,8 @@ hooks_zonesdir   = $(hooksdir)/zones
 
 triggersdir      = $(networkdir)/triggers
 
+logdir           = $(localestatedir)/log/network
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -56,6 +59,10 @@ INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
 
+AM_CFLAGS       = $(OUR_CFLAGS)
+AM_CPPFLAGS     = $(OUR_CPPFLAGS)
+AM_LDFLAGS      = $(OUR_LDFLAGS)
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
        --with-udevdir=$$dc_install_base/$(udevdir)
@@ -75,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 \
@@ -95,10 +103,8 @@ EXTRA_DIST += \
        src/functions/functions.in
 
 dist_network_SCRIPTS = \
-       src/functions/functions.aiccu \
        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 \
@@ -109,13 +115,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 \
@@ -124,7 +131,10 @@ dist_network_SCRIPTS = \
        src/functions/functions.hostapd \
        src/functions/functions.hotplug \
        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 \
@@ -139,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 \
@@ -147,11 +156,15 @@ dist_network_SCRIPTS = \
        src/functions/functions.settings \
        src/functions/functions.stp \
        src/functions/functions.sysctl \
+       src/functions/functions.system \
        src/functions/functions.triggers \
        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 \
@@ -163,45 +176,36 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
-       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/ipsec-updown \
        src/helpers/pppd-angel \
-       src/helpers/wpa_supplicant \
-       src/helpers/wpa_supplicant-config-helper
-
-bridge-stp-install-hook: bridge-stp-uninstall-hook
-       ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/
+       src/helpers/wpa_supplicant
 
-bridge-stp-uninstall-hook:
-       rm -f $(DESTDIR)$(sbindir)/bridge-stp
+bin_PROGRAMS = \
+       src/inetcalc
 
-INSTALL_EXEC_HOOKS += bridge-stp-install-hook
-UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
+src_inetcalc_SOURCES = \
+       src/inetcalc.c
 
 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
 
 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/6rd \
        src/hooks/zones/6to4-tunnel \
-       src/hooks/zones/aiccu \
        src/hooks/zones/bridge \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
@@ -219,7 +223,8 @@ EXTRA_DIST += \
        src/ppp/ip-updown.in
 
 INSTALL_DIRS += \
-       $(pppdir)
+       $(pppdir) \
+       $(logdir)
 
 ppp-install-hook:
        ln -svf ip-updown $(DESTDIR)$(pppdir)/ip-pre-up
@@ -261,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
 
@@ -272,7 +287,7 @@ dist_bashcompletion_SCRIPTS = \
 # ------------------------------------------------------------------------------
 
 dist_tmpfiles_DATA = \
-       src/tmpfiles/network
+       src/tmpfiles/network.conf
 
 # ------------------------------------------------------------------------------
 
@@ -320,19 +335,24 @@ 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 \
-       man/network-port-batman-adv.8 \
-       man/network-port-batman-adv-port.8 \
+       man/network-performance-tuning.8 \
+       man/network-port.8 \
+       man/network-quick-start.8 \
        man/network-route.8 \
+       man/network-route-static.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-modem.8 \
+       man/network-zone-pppoe.8 \
+       man/network-zone-wireless.8
 
 MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
 MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
@@ -414,11 +434,25 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
-       topdir="$(shell pwd)" \
-       networkdir="$(top_srcdir)/src/functions"
+       PATH=$(top_builddir)/src:$(PATH) \
+       functions=$(abs_builddir)/src/functions/functions \
+       networkdir=$(abs_srcdir)/src/functions \
+       testdir=$(top_srcdir)/test
+
+dist_check_DATA = \
+       test/constants.sh \
+       test/test-functions
 
 dist_check_SCRIPTS = \
-       test/load-library
+       $(TESTS)
 
 TESTS = \
-       test/load-library
+       test/load-library \
+       test/functions/ip/ip_detect_protocol \
+       test/functions/ip/ip_get_prefix \
+       test/functions/ip/ip_net_is_valid \
+       test/functions/ip/ip_is_valid \
+       test/functions/ip/ip_network_is_subnet_of \
+       test/functions/ip/ip_prefix_is_valid \
+       test/functions/ip/ip_protocol_is_supported \
+       test/functions/ip/ip_split_prefix
Stevee's network tree.