X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=ce9b9e2a018fbd8f2337697b006677bbbca23be0;hb=7c623df218497c41130c2b231bf8c4a985736c4b;hp=2b86f868598304191147d379c0d17c1bc9bf40c5;hpb=d837cc79eac0ef16fc87de5fd2b98795d9b19a23;p=people%2Fms%2Fnetwork.git diff --git a/Makefile.am b/Makefile.am index 2b86f868..ce9b9e2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,11 @@ AUTOMAKE_OPTIONS = color-tests # keep itermediate files .SECONDARY: +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 @@ -41,9 +43,14 @@ 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 + +logdir = $(localestatedir)/log/network + CLEANFILES = DISTCLEANFILES = EXTRA_DIST = @@ -52,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) @@ -71,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 \ @@ -91,7 +103,6 @@ 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 \ @@ -105,48 +116,53 @@ 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 \ src/functions/functions.he \ src/functions/functions.hook \ 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.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 \ 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 \ src/functions/functions.service \ + src/functions/functions.settings \ src/functions/functions.stp \ src/functions/functions.sysctl \ - src/functions/functions.teredo \ + 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.wpa_supplicant \ src/functions/functions.zone \ @@ -159,17 +175,21 @@ 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/miredo-config-helper \ - src/helpers/miredo-helper \ + src/helpers/ipsec-updown \ src/helpers/pppd-angel \ src/helpers/wpa_supplicant \ src/helpers/wpa_supplicant-config-helper +bin_PROGRAMS = \ + src/inetcalc + +src_inetcalc_SOURCES = \ + src/inetcalc.c + bridge-stp-install-hook: bridge-stp-uninstall-hook ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/ @@ -179,27 +199,27 @@ 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/dhcp \ + src/hooks/configs/ipv4-static \ + src/hooks/configs/ipv6-auto \ + 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 = \ - src/hooks/zones/6rd \ 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 # ------------------------------------------------------------------------------ @@ -214,7 +234,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 @@ -256,13 +277,28 @@ 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 # ------------------------------------------------------------------------------ +dist_bashcompletion_SCRIPTS = \ + src/bash-completion/network + +# ------------------------------------------------------------------------------ + dist_tmpfiles_DATA = \ - src/tmpfiles/network + src/tmpfiles/network.conf # ------------------------------------------------------------------------------ @@ -302,23 +338,34 @@ dist_macros_DATA = \ # ------------------------------------------------------------------------------ +INSTALL_DIRS += \ + $(triggersdir) + +# ------------------------------------------------------------------------------ + MANPAGES = \ - man/firewall-config.8 \ + man/firewall-settings.8 \ man/network.8 \ - man/network-config.8 \ + man/network-color.8 \ + man/network-description.8 \ man/network-device.8 \ + man/network-dhcp.8 \ 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 \ + 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-modem.8 \ man/network-zone-pppoe.8 \ - man/network-zone-pptp.8 + man/network-zone-wireless.8 MANPAGES_XML = $(patsubst %.8,%.xml,$(MANPAGES)) MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML)) @@ -370,7 +417,8 @@ substitutions = \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ '|sbindir=$(sbindir)|' \ - '|networkdir=$(networkdir)|' + '|networkdir=$(networkdir)|' \ + '|helpersdir=$(helpersdir)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -399,11 +447,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