Replace ipcalc by inetcalc

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

diff --git a/Makefile.am b/Makefile.am
index 96d59e42ac10866fd6c01bf63e782b4fa65877e7..bd81906a484d7a57d9cf164ba22ab3a4cf159e3c 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,8 @@ hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
+triggersdir      = $(networkdir)/triggers
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -53,6 +56,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)
@@ -144,6 +151,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.settings \
        src/functions/functions.stp \
        src/functions/functions.sysctl \
+       src/functions/functions.triggers \
        src/functions/functions.usb \
        src/functions/functions.util \
        src/functions/functions.vlan \
@@ -159,6 +167,7 @@ dist_network_SCRIPTS = \
        src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
+       src/helpers/aiccu \
        src/helpers/aiccu-config-helper \
        src/helpers/bridge-stp \
        src/helpers/dhcpd-config-helper \
@@ -168,6 +177,12 @@ dist_helpers_SCRIPTS = \
        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,8 +194,10 @@ 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 = \
@@ -199,7 +216,6 @@ dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/bridge \
        src/hooks/zones/modem \
        src/hooks/zones/pppoe \
-       src/hooks/zones/pptp \
        src/hooks/zones/wireless
 
 # ------------------------------------------------------------------------------
@@ -261,6 +277,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+       src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
        src/tmpfiles/network
 
@@ -302,6 +323,11 @@ dist_macros_DATA = \
 
 # ------------------------------------------------------------------------------
 
+INSTALL_DIRS += \
+       $(triggersdir)
+
+# ------------------------------------------------------------------------------
+
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.8 \
@@ -317,8 +343,7 @@ MANPAGES = \
        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-pptp.8
+       man/network-zone-pppoe.8
 
 MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
 MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))