[systemd-commits] Makefile.am

[Tom Gundersen]

 Makefile.am |   31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

New commits:
commit 911f4d4d60eae3cfa5b8ca122169f3ca21da4afc
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Feb 26 23:16:34 2014 +0100

    build-sys: networkd - simplify makefile fragment

diff --git a/Makefile.am b/Makefile.am
index dd067f6..eaf6c63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4012,8 +4012,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,11 +4029,11 @@ 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 \
@@ -4039,23 +4047,10 @@ GENERAL_ALIASES += \
 	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
 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