chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: rename condition-util.[ch] to condition.[ch]
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ff5f61b5856749afbbe8b1923c4c21f84c9e9ee8..461ffa944d00b44c72267a85fd87130649634b24 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/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 \
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/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 \
src/core/namespace.c \
src/core/namespace.h \
src/core/build.h \
@@
-1359,7
+1357,7
@@
tests += \
test-capability \
test-async \
test-ratelimit \
test-capability \
test-async \
test-ratelimit \
- test-condition
-util
\
+ test-condition \
test-uid-range \
test-bus-policy \
test-locale-util \
test-uid-range \
test-bus-policy \
test-locale-util \
@@
-1519,13
+1517,14
@@
test_copy_SOURCES = \
test_copy_LDADD = \
libsystemd-shared.la
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-shared.la \
- libsystemd-internal.la
-
+ libsystemd-internal.la \
+ libsystemd-capability.la \
+ libsystemd-label.la
test_fdset_SOURCES = \
src/test/test-fdset.c
test_fdset_SOURCES = \
src/test/test-fdset.c
@@
-1543,6
+1542,7
@@
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
src/test/test-util.c
test_util_LDADD = \
+ -lm \
libsystemd-core.la
test_uid_range_SOURCES = \
libsystemd-core.la
test_uid_range_SOURCES = \
@@
-3486,7
+3486,8
@@
systemd_udevd_SOURCES = \
src/udev/udevd.c
systemd_udevd_LDADD = \
src/udev/udevd.c
systemd_udevd_LDADD = \
- libudev-core.la
+ libudev-core.la \
+ libsystemd-capability.la
udevadm_SOURCES = \
src/udev/udevadm.c \
udevadm_SOURCES = \
src/udev/udevadm.c \
@@
-3500,7
+3501,8
@@
udevadm_SOURCES = \
src/udev/udevadm-test-builtin.c
udevadm_LDADD = \
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.
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
@@
-3534,7
+3536,8
@@
test_udev_SOURCES = \
src/test/test-udev.c
test_udev_LDADD = \
src/test/test-udev.c
test_udev_LDADD = \
- libudev-core.la \
+ libudev-core.la \
+ libsystemd-capability.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
@@
-4438,6
+4441,9
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
+dist_udevrules_DATA += \
+ src/vconsole/90-vconsole.rules
+
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
endif
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
endif
@@
-5205,11
+5211,9
@@
networkctl_LDADD = \
test_network_SOURCES = \
src/network/test-network.c
test_network_SOURCES = \
src/network/test-network.c
-test_network_CFLAGS = \
- $(AM_CFLAGS)
-
test_network_LDADD = \
test_network_LDADD = \
- libsystemd-networkd-core.la
+ libsystemd-networkd-core.la \
+ libsystemd-capability.la
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
test_network_tables_SOURCES = \
src/network/test-network-tables.c \