chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: get rid of condition.c and move the remaining call into util.c
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3686103b52e91423883b4c06b9a2e4d01b915fee..a10c306cebc776c652c722bd94cde2dcf161136b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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 \
@@
-1524,8
+1522,9
@@
test_condition_util_SOURCES = \
test_condition_util_LDADD = \
libsystemd-shared.la \
test_condition_util_LDADD = \
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
@@
-3487,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 \
@@
-3501,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.
@@
-3535,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)
@@
-4439,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
@@
-5206,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 \