X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=0139f95e82e0eb268e96742cc637f8cc8b46a670;hp=b28f03049f637a9ab4b1a4ed5bbac327f7fa8b5b;hb=34ca39360410ab03c7909494e6291bbb65622e3d;hpb=c84f31cecec76023a1267c183fe16de5ba4c1601

diff --git a/Makefile.am b/Makefile.am
index b28f0304..0139f95e 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 \
@@ -227,12 +230,12 @@ 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 \
@@ -297,7 +300,15 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 
 util_PROGRAMS = \
-	src/utils/network-phy-list-ht-caps
+	src/utils/network-phy-list-channels \
+	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_ht_caps_SOURCES = \
 	src/utils/network-phy-list-ht-caps.c
@@ -305,6 +316,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 = \
@@ -604,6 +621,8 @@ NITSI_TESTS = \
 	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/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 \
@@ -622,6 +641,10 @@ EXTRA_DIST += \
 	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/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 \