chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce CONF_DIRS_NULSTR helper to define standard conf dirs
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 701666c2787c4f06e1b198fd1bf607d7cd42dbc0..ddd0df1379e51e35aa6c23a880d3a5e7e1da6e09 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1121,6
+1121,8
@@
libsystemd_core_la_SOURCES = \
src/core/machine-id-setup.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
src/core/machine-id-setup.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
+ src/core/kmod-setup.c \
+ src/core/kmod-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
src/core/namespace.c \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
src/core/namespace.c \
@@
-1136,12
+1138,6
@@
libsystemd_core_la_SOURCES = \
src/core/failure-action.c \
src/core/failure-action.h
src/core/failure-action.c \
src/core/failure-action.h
-if HAVE_KMOD
-libsystemd_core_la_SOURCES += \
- src/core/kmod-setup.c \
- src/core/kmod-setup.h
-endif
-
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c
@@
-1387,7
+1383,10
@@
EXTRA_DIST += \
test/bus-policy/hello.conf \
test/bus-policy/methods.conf \
test/bus-policy/ownerships.conf \
test/bus-policy/hello.conf \
test/bus-policy/methods.conf \
test/bus-policy/ownerships.conf \
- test/bus-policy/signals.conf
+ test/bus-policy/signals.conf \
+ test/bus-policy/check-own-rules.conf \
+ test/bus-policy/many-rules.conf \
+ test/bus-policy/test.conf
EXTRA_DIST += \
EXTRA_DIST += \
@@
-2902,7
+2901,9
@@
test_resolve_CFLAGS = \
-pthread
busctl_SOURCES = \
-pthread
busctl_SOURCES = \
- src/libsystemd/sd-bus/busctl.c
+ src/libsystemd/sd-bus/busctl.c \
+ src/libsystemd/sd-bus/busctl-introspect.c \
+ src/libsystemd/sd-bus/busctl-introspect.h
busctl_LDADD = \
libsystemd-dump.la \
busctl_LDADD = \
libsystemd-dump.la \
@@
-3464,7
+3465,9
@@
udevadm_SOURCES = \
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
- src/udev/udevadm-test-builtin.c
+ src/udev/udevadm-test-builtin.c \
+ src/udev/udevadm-util.c \
+ src/udev/udevadm-util.h
udevadm_LDADD = \
libudev-core.la
udevadm_LDADD = \
libudev-core.la
@@
-4628,7
+4631,12
@@
systemd_localed_SOURCES = \
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(XKBCOMMON_LIBS)
+
+systemd_localed_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(XKBCOMMON_CFLAGS)
nodist_systemunit_DATA += \
units/systemd-localed.service
nodist_systemunit_DATA += \
units/systemd-localed.service