daemon: Fix return code handling when listing ports/zones

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

diff --git a/Makefile.am b/Makefile.am
index d78d61ee602b10040a595485c79c29b514db72c6..273302b3f92036b9307fc8325edd09530e98b719 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ INSTALL_DIRS =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
-sbin_PROGRAMS =
+network_PROGRAMS =
 dist_dbuspolicy_DATA =
 dist_dbussystembus_DATA =
 dist_polkitpolicy_DATA =
@@ -304,10 +304,11 @@ 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 \
@@ -322,13 +323,24 @@ dist_networkd_SOURCES = \
        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/port.c \
-       src/networkd/port.h \
        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/port-dummy.c \
+       src/networkd/port-dummy.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 \
@@ -373,6 +385,30 @@ 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/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 \
@@ -616,6 +652,7 @@ substitutions = \
        '|builddir=$(abs_builddir)|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
+       '|bindir=$(bindir)|' \
        '|sbindir=$(sbindir)|' \
        '|networkdir=$(networkdir)|' \
        '|helpersdir=$(helpersdir)|' \