chiark / gitweb /
architecture: Add tilegx
[elogind.git] / Makefile.am
index dd067f6d00fc6184c079fa179a144531c27a79aa..6be64070f4c63a70bab8d612af0cc667e143ef8c 100644 (file)
@@ -196,6 +196,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-bus \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
+       -I $(top_srcdir)/src/libsystemd-network \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -502,9 +503,6 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-udevd.service \
-       units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \
        units/systemd-hybrid-sleep.service.in \
@@ -2401,41 +2399,44 @@ busctl_CFLAGS = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-dhcp.la
+       libsystemd-network.la
 
-libsystemd_dhcp_la_SOURCES = \
+libsystemd_network_la_SOURCES = \
+       src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/sd-dhcp-client.c \
-       src/libsystemd-dhcp/dhcp-lease.h \
-       src/libsystemd-dhcp/dhcp-lease.c \
-       src/libsystemd-dhcp/dhcp-network.c \
-       src/libsystemd-dhcp/dhcp-option.c \
-       src/libsystemd-dhcp/dhcp-packet.c \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/dhcp-protocol.h
-
-libsystemd_dhcp_la_LIBADD = \
+       src/systemd/sd-dhcp-lease.h \
+       src/network/sd-network.c \
+       src/libsystemd-network/sd-dhcp-client.c \
+       src/libsystemd-network/dhcp-network.c \
+       src/libsystemd-network/dhcp-option.c \
+       src/libsystemd-network/dhcp-packet.c \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-lease-internal.h \
+       src/libsystemd-network/sd-dhcp-lease.c
+
+libsystemd_network_la_LIBADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 test_dhcp_option_SOURCES = \
-       src/libsystemd-dhcp/dhcp-protocol.h \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/test-dhcp-option.c
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/test-dhcp-option.c
 
 test_dhcp_option_LDADD = \
-       libsystemd-dhcp.la \
+       libsystemd-network.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 test_dhcp_client_SOURCES = \
        src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/dhcp-protocol.h \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/test-dhcp-client.c
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/test-dhcp-client.c
 
 test_dhcp_client_LDADD = \
-       libsystemd-dhcp.la \
+       libsystemd-network.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -4012,8 +4013,16 @@ rootlibexec_PROGRAMS += \
        systemd-networkd
 
 systemd_networkd_SOURCES = \
+       src/network/networkd.c
+
+systemd_networkd_LDADD = \
+       libsystemd-networkd-core.la
+
+noinst_LTLIBRARIES += \
+       libsystemd-networkd-core.la
+
+libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd.h \
-       src/network/networkd.c \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-network.c \
@@ -4021,14 +4030,14 @@ systemd_networkd_SOURCES = \
        src/network/networkd-route.c \
        src/network/networkd-manager.c
 
-nodist_systemd_networkd_SOURCES = \
+nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
        src/network/networkd-netdev-gperf.c
 
-systemd_networkd_LDADD = \
+libsystemd_networkd_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-dhcp.la \
+       libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -4038,24 +4047,21 @@ nodist_systemunit_DATA += \
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
+rootlibexec_PROGRAMS += \
+       systemd-networkd-wait-online
+
+systemd_networkd_wait_online_SOURCES = \
+       src/network/networkd-wait-online.c
+
+systemd_networkd_wait_online_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-network.la
+
 test_network_SOURCES = \
-       src/network/test-network.c \
-       src/network/networkd.h \
-       src/network/networkd-link.c \
-       src/network/networkd-netdev.c \
-       src/network/networkd-network.c \
-       src/network/networkd-address.c \
-       src/network/networkd-route.c \
-       src/network/networkd-manager.c \
-       src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
+       src/network/test-network.c
 
 test_network_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-dhcp.la \
-       libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-networkd-core.la
 
 tests += \
        test-network