config: Avoid adding empty line after integers

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

diff --git a/Makefile.am b/Makefile.am
index b6ba5accd9ca66a59398697452de2bf4f04f9c5f..22d90d48ee73ca353b0b11005f2cd23dac7c5f2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ AUTOMAKE_OPTIONS = color-tests
 configdir        = $(sysconfdir)/network
 bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
+modprobedir      = $(prefix)/lib/modprobe.d
 pkgconfigdir     = $(libdir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
 systemconfigdir  = $(datadir)/network
@@ -60,6 +61,11 @@ INSTALL_DIRS =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
+network_PROGRAMS =
+dist_dbuspolicy_DATA =
+dist_dbussystembus_DATA =
+dist_polkitpolicy_DATA =
+systemdsystemunit_DATA =
 
 AM_CPPFLAGS = \
        $(OUR_CPPFLAGS) \
@@ -298,6 +304,105 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+network_PROGRAMS += \
+       networkd
+
+dist_networkd_SOURCES = \
+       src/networkd/address.h \
+       src/networkd/bus.c \
+       src/networkd/bus.h \
+       src/networkd/config.c \
+       src/networkd/config.h \
+       src/networkd/daemon.c \
+       src/networkd/daemon.h \
+       src/networkd/daemon-bus.c \
+       src/networkd/daemon-bus.h \
+       src/networkd/devmon.c \
+       src/networkd/devmon.h \
+       src/networkd/link.c \
+       src/networkd/link.h \
+       src/networkd/links.c \
+       src/networkd/links.h \
+       src/networkd/logging.c \
+       src/networkd/logging.h \
+       src/networkd/main.c \
+       src/networkd/ports.c \
+       src/networkd/ports.h \
+       src/networkd/port.c \
+       src/networkd/port.h \
+       src/networkd/port-bus.c \
+       src/networkd/port-bus.h \
+       src/networkd/stats-collector.c \
+       src/networkd/stats-collector.h \
+       src/networkd/string.h \
+       src/networkd/util.c \
+       src/networkd/util.h \
+       src/networkd/zones.c \
+       src/networkd/zones.h \
+       src/networkd/zone.c \
+       src/networkd/zone.h \
+       src/networkd/zone-bus.c \
+       src/networkd/zone-bus.h
+
+networkd_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DCONFIG_DIR="\"$(configdir)\""
+
+networkd_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS) \
+       $(SYSTEMD_CFLAGS)
+
+networkd_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+networkd_LDADD = \
+       src/libnetwork.la \
+       $(CAP_LIBS) \
+       $(SYSTEMD_LIBS)
+
+dist_dbuspolicy_DATA += \
+       src/networkd/org.ipfire.network1.conf
+
+dist_dbussystembus_DATA += \
+       src/networkd/org.ipfire.network1.service
+
+dist_polkitpolicy_DATA += \
+       src/networkd/org.ipfire.network1.policy
+
+systemdsystemunit_DATA += \
+       src/networkd/networkd.service
+
+EXTRA_DIST += \
+       src/networkd/networkd.service.in
+
+CLEANFILES += \
+       src/networkd/networkd.service
+
+# ------------------------------------------------------------------------------
+
+bin_PROGRAMS += \
+       networkctl
+
+dist_networkctl_SOURCES = \
+       src/networkctl/command.c \
+       src/networkctl/command.h \
+       src/networkctl/main.c \
+       src/networkctl/zone.c \
+       src/networkctl/zone.h
+
+networkctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SYSTEMD_CFLAGS)
+
+networkctl_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+networkctl_LDADD = \
+       $(SYSTEMD_LIBS)
+
+# ------------------------------------------------------------------------------
+
 util_PROGRAMS = \
        src/utils/network-phy-list-channels \
        src/utils/network-phy-list-ciphers \
@@ -360,7 +465,7 @@ UNINSTALL_EXEC_HOOKS += ppp-uninstall-hook
 # ------------------------------------------------------------------------------
 
 if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
+systemdsystemunit_DATA += \
        src/systemd/firewall.service \
        src/systemd/firewall-init.service \
        src/systemd/network-init.service \
@@ -396,6 +501,11 @@ dist_sysctl_DATA = \
 
 # ------------------------------------------------------------------------------
 
+dist_modprobe_DATA = \
+       src/modprobe.d/no-copybreak.conf
+
+# ------------------------------------------------------------------------------
+
 dist_bashcompletion_SCRIPTS = \
        src/bash-completion/network
 
@@ -460,6 +570,7 @@ MANPAGES = \
        man/network-route-static.8 \
        man/network-settings.8 \
        man/network-vpn.8 \
+       man/network-vpn-ipsec.8 \
        man/network-vpn-security-policies.8 \
        man/network-zone.8 \
        man/network-zone-bridge.8 \
@@ -535,6 +646,7 @@ substitutions = \
        '|builddir=$(abs_builddir)|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
+       '|bindir=$(bindir)|' \
        '|sbindir=$(sbindir)|' \
        '|networkdir=$(networkdir)|' \
        '|helpersdir=$(helpersdir)|' \