X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=461ffa944d00b44c72267a85fd87130649634b24;hb=d48b7bd271b1e70924c8485d2f95c2f5a1ae77cb;hp=f614b86c07b56b9dc66f734836a933bea5032b56;hpb=f6ba8671d83f9fce9a00045d8fa399a1c07ba7fc;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f614b86c0..461ffa944 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -861,8 +861,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/audit.h \
 	src/shared/xml.c \
 	src/shared/xml.h \
-	src/shared/condition-util.c \
-	src/shared/condition-util.h \
+	src/shared/condition.c \
+	src/shared/condition.h \
 	src/shared/bus-label.c \
 	src/shared/bus-label.h \
 	src/shared/gpt.h \
@@ -1132,8 +1132,6 @@ libsystemd_core_la_SOURCES = \
 	src/core/mount-setup.h \
 	src/core/loopback-setup.h \
 	src/core/loopback-setup.c \
-	src/core/condition.c \
-	src/core/condition.h \
 	src/core/namespace.c \
 	src/core/namespace.h \
 	src/core/build.h \
@@ -1359,7 +1357,7 @@ tests += \
 	test-capability \
 	test-async \
 	test-ratelimit \
-	test-condition-util \
+	test-condition \
 	test-uid-range \
 	test-bus-policy \
 	test-locale-util \
@@ -1519,13 +1517,14 @@ test_copy_SOURCES = \
 test_copy_LDADD = \
 	libsystemd-shared.la
 
-test_condition_util_SOURCES = \
-	src/test/test-condition-util.c
+test_condition_SOURCES = \
+	src/test/test-condition.c
 
-test_condition_util_LDADD = \
+test_condition_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-internal.la
-
+	libsystemd-internal.la \
+	libsystemd-capability.la \
+	libsystemd-label.la
 
 test_fdset_SOURCES = \
 	src/test/test-fdset.c
@@ -3487,7 +3486,8 @@ systemd_udevd_SOURCES = \
 	src/udev/udevd.c
 
 systemd_udevd_LDADD = \
-	libudev-core.la
+	libudev-core.la \
+	libsystemd-capability.la
 
 udevadm_SOURCES = \
 	src/udev/udevadm.c \
@@ -3501,7 +3501,8 @@ udevadm_SOURCES = \
 	src/udev/udevadm-test-builtin.c
 
 udevadm_LDADD = \
-	libudev-core.la
+	libudev-core.la \
+	libsystemd-capability.la
 
 # Update hwdb on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
@@ -3535,7 +3536,8 @@ test_udev_SOURCES = \
 	src/test/test-udev.c
 
 test_udev_LDADD = \
-	libudev-core.la \
+	libudev-core.la  \
+	libsystemd-capability.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS) \
 	$(SELINUX_LIBS)
@@ -5209,11 +5211,9 @@ networkctl_LDADD = \
 test_network_SOURCES = \
 	src/network/test-network.c
 
-test_network_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_network_LDADD = \
-	libsystemd-networkd-core.la
+	libsystemd-networkd-core.la \
+	libsystemd-capability.la
 
 test_network_tables_SOURCES = \
 	src/network/test-network-tables.c \