inetcalc: Use memcmp to determine which IP address is higher

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

diff --git a/Makefile.am b/Makefile.am
index d4dfc3d19528c5afedd34c766b9ed4d99932c4ad..c9a7155729954107f14fd3783f82f50c4d589b5a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,7 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
+bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
 pkgconfigdatadir = $(datadir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
@@ -45,6 +46,10 @@ hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
+triggersdir      = $(networkdir)/triggers
+
+logdir           = $(localestatedir)/log/network
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -53,6 +58,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)
@@ -92,7 +101,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 \
@@ -119,18 +127,18 @@ dist_network_SCRIPTS = \
        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.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 \
@@ -145,7 +153,8 @@ dist_network_SCRIPTS = \
        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 \
@@ -161,17 +170,20 @@ 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/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)/
 
@@ -183,31 +195,27 @@ UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
 
 dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/ipv4-dhcp \
-       src/hooks/configs/ipv6-static \
        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/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
 
 # ------------------------------------------------------------------------------
@@ -222,7 +230,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
@@ -269,8 +278,13 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+       src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
-       src/tmpfiles/network
+       src/tmpfiles/network.conf
 
 # ------------------------------------------------------------------------------
 
@@ -310,23 +324,32 @@ dist_macros_DATA = \
 
 # ------------------------------------------------------------------------------
 
+INSTALL_DIRS += \
+       $(triggersdir)
+
+# ------------------------------------------------------------------------------
+
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.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-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))
@@ -408,11 +431,23 @@ 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
 
 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_is_network \
+       test/functions/ip/ip_is_valid \
+       test/functions/ip/ip_prefix_is_valid \
+       test/functions/ip/ip_protocol_is_supported \
+       test/functions/ip/ip_split_prefix