Disable async logging

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

diff --git a/Makefile.am b/Makefile.am
index 96d59e42ac10866fd6c01bf63e782b4fa65877e7..bf3886e585b5950a9fa997ea9df5c3679e87187b 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
@@ -179,8 +180,9 @@ 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-static \
        src/hooks/configs/pppoe-server
 
 dist_hooks_ports_SCRIPTS = \
@@ -199,7 +201,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 +262,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_bashcompletion_SCRIPTS = \
+       src/bash-completion/network
+
+# ------------------------------------------------------------------------------
+
 dist_tmpfiles_DATA = \
        src/tmpfiles/network
 
@@ -317,8 +323,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))