Makefile: Fix typo in localstatedir

[network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2046fef2a31a682af179d4ab6867a6028a7c5c4d..7ca12292dc6889852f0eaf41f3fc299ba7f9033e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ hooks_zonesdir   = $(hooksdir)/zones
 
 triggersdir      = $(networkdir)/triggers
 
-logdir           = $(localestatedir)/log/network
+logdir           = $(localstatedir)/log/network
 utildir          = $(networkdir)
 
 CLEANFILES =
@@ -59,9 +59,10 @@ DISTCLEANFILES =
 EXTRA_DIST =
 INSTALL_DIRS =
 INSTALL_EXEC_HOOKS =
+TESTS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
-sbin_PROGRAMS =
+network_PROGRAMS =
 dist_dbuspolicy_DATA =
 dist_dbussystembus_DATA =
 dist_polkitpolicy_DATA =
@@ -304,19 +305,52 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
-sbin_PROGRAMS += \
+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/json.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-bonding.c \
+       src/networkd/port-bonding.h \
+       src/networkd/port-bus.c \
+       src/networkd/port-bus.h \
+       src/networkd/port-dummy.c \
+       src/networkd/port-dummy.h \
+       src/networkd/port-ethernet.c \
+       src/networkd/port-ethernet.h \
+       src/networkd/port-veth.c \
+       src/networkd/port-veth.h \
+       src/networkd/port-vlan.c \
+       src/networkd/port-vlan.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 \
@@ -328,12 +362,17 @@ networkd_CPPFLAGS = \
 
 networkd_CFLAGS = \
        $(AM_CFLAGS) \
+       $(CAP_CFLAGS) \
+       $(JSON_C_CFLAGS) \
        $(SYSTEMD_CFLAGS)
 
 networkd_LDFLAGS = \
        $(AM_LDFLAGS)
 
 networkd_LDADD = \
+       src/libnetwork.la \
+       $(CAP_LIBS) \
+       $(JSON_C_LIBS) \
        $(SYSTEMD_LIBS)
 
 dist_dbuspolicy_DATA += \
@@ -356,6 +395,34 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 
+bin_PROGRAMS += \
+       networkctl
+
+dist_networkctl_SOURCES = \
+       src/networkctl/command.c \
+       src/networkctl/command.h \
+       src/networkctl/main.c \
+       src/networkctl/port.c \
+       src/networkctl/port.h \
+       src/networkctl/terminal.c \
+       src/networkctl/terminal.h \
+       src/networkctl/zone.c \
+       src/networkctl/zone.h
+
+networkctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(JSON_C_CFLAGS) \
+       $(SYSTEMD_CFLAGS)
+
+networkctl_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+networkctl_LDADD = \
+       $(JSON_C_LIBS) \
+       $(SYSTEMD_LIBS)
+
+# ------------------------------------------------------------------------------
+
 util_PROGRAMS = \
        src/utils/network-phy-list-channels \
        src/utils/network-phy-list-ciphers \
@@ -599,6 +666,7 @@ substitutions = \
        '|builddir=$(abs_builddir)|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
+       '|bindir=$(bindir)|' \
        '|sbindir=$(sbindir)|' \
        '|networkdir=$(networkdir)|' \
        '|helpersdir=$(helpersdir)|' \
@@ -631,12 +699,10 @@ TESTS_ENVIRONMENT = \
 
 dist_check_DATA = \
        test/constants.sh \
-       test/test-functions
+       test/test-functions \
+       test/networkd/test.sh
 
 dist_check_SCRIPTS = \
-       $(TESTS)
-
-TESTS = \
        test/load-library \
        test/functions/ip/ip_detect_protocol \
        test/functions/ip/ip_get_prefix \
@@ -647,6 +713,24 @@ TESTS = \
        test/functions/ip/ip_protocol_is_supported \
        test/functions/ip/ip_split_prefix
 
+TESTS += $(dist_check_SCRIPTS)
+
+TEST_EXTENSIONS = .t
+
+NETWORKD_TESTS = \
+       test/networkd/00_launch.t \
+       test/networkd/01_dummy.t
+
+TESTS += $(NETWORKD_TESTS)
+
+EXTRA_DIST += \
+       test/networkd/test.sh \
+       $(NETWORKD_TESTS)
+
+# Run all networkd tests in their own namespaces
+T_LOG_COMPILER = unshare --net --ipc --uts --user --cgroup --time --pid --fork \
+       --map-root-user --keep-caps $(SHELL) test/networkd/test.sh
+
 # - NITSI tests ----------------------------------------------------------------
 
 # Files for the virtual environment