chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: more log_*_errno + return simplifications
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0b32639fae952b5aea1da93a9dcaf7f7f453eac1..7ab1deabcca0dbf69a4d496111095a2e9218aeed 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
@@
-1350,6
+1346,7
@@
tests += \
test-uid-range \
test-bus-policy \
test-locale-util \
test-uid-range \
test-bus-policy \
test-locale-util \
+ test-execute \
test-copy
EXTRA_DIST += \
test-copy
EXTRA_DIST += \
@@
-1386,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 += \
@@
-1805,6
+1805,15
@@
test_path_CFLAGS = \
test_path_LDADD = \
libsystemd-core.la
test_path_LDADD = \
libsystemd-core.la
+test_execute_SOURCES = \
+ src/test/test-execute.c
+
+test_execute_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_execute_LDADD = \
+ libsystemd-core.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
@@
-2030,7
+2039,6
@@
nodist_tmpfiles_DATA = \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
- tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf
@@
-2085,8
+2093,7
@@
SYSINIT_TARGET_WANTS += \
systemd-sysusers.service
dist_sysusers_DATA = \
systemd-sysusers.service
dist_sysusers_DATA = \
- sysusers.d/systemd.conf \
- sysusers.d/systemd-remote.conf
+ sysusers.d/systemd.conf
nodist_sysusers_DATA = \
sysusers.d/basic.conf
nodist_sysusers_DATA = \
sysusers.d/basic.conf
@@
-2892,7
+2899,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 \
@@
-3277,6
+3286,7
@@
dist_udevrules_DATA += \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
+ rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
@@
-3303,7
+3313,8
@@
dist_udevhwdb_DATA = \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-net-ifname.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-net-ifname.hwdb \
- hwdb/60-keyboard.hwdb
+ hwdb/60-keyboard.hwdb \
+ hwdb/70-mouse.hwdb
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
@@
-3454,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
@@
-3826,6
+3839,16
@@
systemd_journal_remote_CFLAGS = \
systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS)
systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS)
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+ sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+ tmpfiles.d/systemd-remote.conf
+endif
+
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
@@
-4618,7
+4641,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
~ianmdlvl / elogind.git / blobdiff