build-sys: avoid duplication of macro definition

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff5f61b5856749afbbe8b1923c4c21f84c9e9ee8..ca8e339b5ae71eff406da71b9743287be36fb333 100644 (file)
--- 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 \
@@ -1323,6 +1321,7 @@ tests += \
        test-env-replace \
        test-strbuf \
        test-strv \
+       test-path \
        test-path-util \
        test-strxcpyx \
        test-unit-name \
@@ -1359,7 +1358,7 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
-       test-condition-util \
+       test-condition \
        test-uid-range \
        test-bus-policy \
        test-locale-util \
@@ -1519,13 +1518,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
@@ -1543,6 +1543,7 @@ test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
+       -lm \
        libsystemd-core.la
 
 test_uid_range_SOURCES = \
@@ -1764,8 +1765,7 @@ test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
 
 test_cgroup_mask_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1809,6 +1809,15 @@ test_path_util_SOURCES = \
 test_path_util_LDADD = \
        libsystemd-shared.la
 
+test_path_SOURCES = \
+       src/test/test-path.c
+
+test_path_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_path_LDADD = \
+       libsystemd-core.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -1834,8 +1843,7 @@ test_sched_prio_SOURCES = \
        src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
 
 test_sched_prio_CFLAGS = \
        $(AM_CFLAGS) \
@@ -3486,7 +3494,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 \
@@ -3500,7 +3509,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.
@@ -3534,7 +3544,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)
@@ -4438,6 +4449,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
+dist_udevrules_DATA += \
+       src/vconsole/90-vconsole.rules
+
 SYSINIT_TARGET_WANTS += \
        systemd-vconsole-setup.service
 endif
@@ -5205,11 +5219,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 \