chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: link with librt if linking with libsd-daemon-int
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a4443fba9af0411d198904a001b10955f476eb01..b8b8d06629e2413e6cead755730e4defd100e0ac 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-82,9
+82,9
@@
userunitdir=$(prefix)/lib/systemd/user
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(prefix)/lib/systemd/user-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
@@
-347,7
+347,9
@@
dist_zshcompletion_DATA = \
shell-completion/zsh/_systemctl \
shell-completion/zsh/_journalctl \
shell-completion/zsh/_udevadm \
shell-completion/zsh/_systemctl \
shell-completion/zsh/_journalctl \
shell-completion/zsh/_udevadm \
+ shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-nspawn \
+ shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd
dist_sysctl_DATA = \
shell-completion/zsh/_systemd
dist_sysctl_DATA = \
@@
-1564,6
+1566,9
@@
SYSINIT_TARGET_WANTS += \
systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service
systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_systemd-tmpfiles
+
TIMERS_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
TIMERS_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
@@
-2085,6
+2090,7
@@
libudev_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-id128-internal.la
pkgconfiglib_DATA += \
libsystemd-id128-internal.la
pkgconfiglib_DATA += \
@@
-2256,6
+2262,7
@@
libudev_core_la_LIBADD = \
libudev-private.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
libudev-private.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-2642,7
+2649,8
@@
libsystemd_id128_la_LDFLAGS = \
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
@@
-2789,6
+2797,15
@@
test_journal_stream_LDADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_init_SOURCES = \
+ src/journal/test-journal-init.c
+
+test_journal_init_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
+ libsystemd-journal.la
+
test_journal_verify_SOURCES = \
src/journal/test-journal-verify.c
test_journal_verify_SOURCES = \
src/journal/test-journal-verify.c
@@
-2853,6
+2870,7
@@
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
@@
-2979,6
+2997,7
@@
tests += \
test-journal-syslog \
test-journal-match \
test-journal-stream \
test-journal-syslog \
test-journal-match \
test-journal-stream \
+ test-journal-init \
test-journal-verify \
test-journal-interleaving \
test-mmap-cache \
test-journal-verify \
test-journal-interleaving \
test-mmap-cache \
@@
-3098,7
+3117,9
@@
systemd_coredumpctl_SOURCES = \
systemd_coredumpctl_LDADD = \
libsystemd-shared.la \
systemd_coredumpctl_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
bin_PROGRAMS += \
systemd-coredumpctl
bin_PROGRAMS += \
systemd-coredumpctl
@@
-3631,6
+3652,9
@@
dist_dbussystemservice_DATA += \
dist_dbuspolicy_DATA += \
src/machine/org.freedesktop.machine1.conf
dist_dbuspolicy_DATA += \
src/machine/org.freedesktop.machine1.conf
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_machinectl
+
SYSTEM_UNIT_ALIASES += \
systemd-machined.service dbus-org.freedesktop.machine1.service
SYSTEM_UNIT_ALIASES += \
systemd-machined.service dbus-org.freedesktop.machine1.service
@@
-3796,7
+3820,8
@@
libsystemd_login_la_LDFLAGS = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
@@
-3824,6
+3849,7
@@
pam_systemd_la_LIBADD = \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-daemon-internal.la \
+ $(RT_LIBS) \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
@@
-4008,7
+4034,8
@@
_reader_la_LIBADD = \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-shared.la \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
login_la_SOURCES = \
src/python-systemd/login.c \
login_la_SOURCES = \
src/python-systemd/login.c \
@@
-4031,7
+4058,8
@@
login_la_LIBADD = \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la \
+ $(RT_LIBS)
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
@@
-4088,6
+4116,8
@@
substitutions = \
'|catalogdir=$(catalogdir)|' \
'|tmpfilesdir=$(tmpfilesdir)|' \
'|sysctldir=$(sysctldir)|' \
'|catalogdir=$(catalogdir)|' \
'|tmpfilesdir=$(tmpfilesdir)|' \
'|sysctldir=$(sysctldir)|' \
+ '|systemgeneratordir=$(systemgeneratordir)|' \
+ '|usergeneratordir=$(usergeneratordir)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \