X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=1b5e7e92ec03f40d90570262dd03cec23e187519;hp=3688508353a7206a9f9708372b7a1e9aec7b637c;hb=298a1ffe3f10ec14416c3aed19bb541553de160a;hpb=ae7a79dae0518a09d68eb201f3cae9f07bc6e9ed diff --git a/Makefile.am b/Makefile.am index 36885083..1b5e7e92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,6 +127,7 @@ EXTRA_DIST += \ dist_network_DATA = \ src/functions/functions.at \ src/functions/functions.auth \ + src/functions/functions.bird \ src/functions/functions.bonding \ src/functions/functions.bridge \ src/functions/functions.cli \ @@ -161,11 +162,13 @@ dist_network_DATA = \ src/functions/functions.ip-tunnel \ src/functions/functions.ipv4 \ src/functions/functions.ipv6 \ + src/functions/functions.leds \ src/functions/functions.list \ src/functions/functions.lock \ src/functions/functions.logging \ src/functions/functions.macros \ src/functions/functions.modem \ + src/functions/functions.offloading \ src/functions/functions.phy \ src/functions/functions.ports \ src/functions/functions.ppp \ @@ -193,12 +196,12 @@ dist_network_DATA = \ src/network-radvd-config \ src/header-config \ src/header-port \ - src/header-zone \ - src/ppp/dialer \ - src/ppp/pppoe-server + src/header-zone dist_network_SCRIPTS = \ - src/dhclient-helper + src/dhclient-helper \ + src/ppp/dialer \ + src/ppp/pppoe-server dist_helpers_SCRIPTS = \ src/helpers/dhcpd-config-helper \ @@ -227,13 +230,14 @@ dist_hooks_ports_SCRIPTS = \ src/hooks/ports/bonding \ src/hooks/ports/dummy \ src/hooks/ports/ethernet \ + src/hooks/ports/ip-tunnel \ src/hooks/ports/vlan \ src/hooks/ports/wireless-ap \ src/hooks/ports/wireless-mesh dist_hooks_zones_SCRIPTS = \ - src/hooks/zones/6to4-tunnel \ src/hooks/zones/bridge \ + src/hooks/zones/ip-tunnel \ src/hooks/zones/modem \ src/hooks/zones/pppoe \ src/hooks/zones/wireless @@ -296,7 +300,22 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ util_PROGRAMS = \ - src/utils/network-phy-list-ht-caps + src/utils/network-phy-list-channels \ + src/utils/network-phy-list-ciphers \ + src/utils/network-phy-list-ht-caps \ + src/utils/network-phy-list-vht-caps + +src_utils_network_phy_list_channels_SOURCES = \ + src/utils/network-phy-list-channels.c + +src_utils_network_phy_list_channels_LDADD = \ + src/libnetwork.la + +src_utils_network_phy_list_ciphers_SOURCES = \ + src/utils/network-phy-list-ciphers.c + +src_utils_network_phy_list_ciphers_LDADD = \ + src/libnetwork.la src_utils_network_phy_list_ht_caps_SOURCES = \ src/utils/network-phy-list-ht-caps.c @@ -304,6 +323,12 @@ src_utils_network_phy_list_ht_caps_SOURCES = \ src_utils_network_phy_list_ht_caps_LDADD = \ src/libnetwork.la +src_utils_network_phy_list_vht_caps_SOURCES = \ + src/utils/network-phy-list-vht-caps.c + +src_utils_network_phy_list_vht_caps_LDADD = \ + src/libnetwork.la + # ------------------------------------------------------------------------------ ppp_SCRIPTS = \ @@ -442,9 +467,9 @@ MANPAGES = \ man/network-vpn.8 \ man/network-vpn-security-policies.8 \ man/network-zone.8 \ - man/network-zone-6to4-tunnel.8 \ man/network-zone-bridge.8 \ man/network-zone-config-pppoe-server.8 \ + man/network-zone-ip-tunnel.8 \ man/network-zone-modem.8 \ man/network-zone-pppoe.8 \ man/network-zone-wireless.8 @@ -597,17 +622,24 @@ CLEANFILES += \ test/nitsi/include/setup NITSI_TESTS = \ - test/nitsi/test/hello-world \ test/nitsi/test/make-check \ test/nitsi/test/phase1 \ + test/nitsi/test/pppoe \ test/nitsi/test/raw-device-get-by-mac \ test/nitsi/test/zone-new-bridge \ - test/nitsi/test/zone-port-attach-bridge + test/nitsi/test/zone-port-attach-bridge \ + test/nitsi/test/zone/ip-tunnel/gre6 \ + test/nitsi/test/zone/ip-tunnel/gre4 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4 \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6 \ + test/nitsi/test/port-vlan EXTRA_DIST += \ test/nitsi/test/settings.in \ - test/nitsi/test/hello-world/recipe \ - test/nitsi/test/hello-world/settings \ test/nitsi/test/make-check/recipe.in \ test/nitsi/test/make-check/settings.in \ test/nitsi/test/raw-device-get-by-mac/recipe \ @@ -615,7 +647,25 @@ EXTRA_DIST += \ test/nitsi/test/zone-new-bridge/recipe \ test/nitsi/test/zone-new-bridge/settings.in \ test/nitsi/test/zone-port-attach-bridge/recipe \ - test/nitsi/test/zone-port-attach-bridge/settings.in + test/nitsi/test/zone-port-attach-bridge/settings.in \ + test/nitsi/test/zone/ip-tunnel/gre6/recipe \ + test/nitsi/test/zone/ip-tunnel/gre6/settings \ + test/nitsi/test/zone/ip-tunnel/gre4/recipe \ + test/nitsi/test/zone/ip-tunnel/gre4/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv4/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv4-via-ipv6/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv4/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv6-via-ipv6/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv4/settings \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/recipe \ + test/nitsi/test/vpn/ipsec/n2n/vti/ipv64-via-ipv6/settings \ + test/nitsi/test/port-vlan/recipe \ + test/nitsi/test/port-vlan/settings CLEANFILES += \ test/nitsi/test/settings \ @@ -628,12 +678,12 @@ CLEANFILES += \ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): % : %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES) +$(NITSI_TESTS): % : dist %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES) $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ \ - --default-settings $(abs_builddir)/test/nitsi/test/settings + --default-settings $(abs_builddir)/test/nitsi/test/settings --interactive-error-handling .PHONY: nitsi -nitsi: dist $(NITSI_TESTS) +nitsi: $(NITSI_TESTS) # Downloads a virtual image file and extracts it $(VIRTUAL_ENVIRONMENT_IMAGES):