summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-06 02:02:13 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-06 14:21:10 +0100
commita4705396adbf1a8a3e52ed133d9b1f12cb13e77e (patch)
tree46818d00ad1b0eff9cb83658be87ac6c3b39233a /Makefile.am
parentd1bddcec98551ea748f39a742a4cbcf9ea9254ef (diff)
condition: internalize condition test functions
Also, implement the negation check inside of condition_test() instead of individually in each test function.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 452f07ca7..c5667c3a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3488,7 +3488,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 \
@@ -3502,7 +3503,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.
@@ -3536,7 +3538,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)
@@ -5210,11 +5213,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 \