chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: when registering a new session always use previous session info from cgroup...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 790e5014beee00fdf49fce2a92a4fe01a9809837..3d3f2652f652c8a3070e188f774800866b160e14 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-64,7
+64,7
@@
pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=
$(sysconfdir)/bash_completion.d
+bashcompletiondir=
@bashcompletiondir@
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@
-316,7
+316,9
@@
systemd_analyze_LDADD = \
libsystemd-dbus.la
dist_bashcompletion_DATA = \
libsystemd-dbus.la
dist_bashcompletion_DATA = \
- shell-completion/systemd-bash-completion.sh
+ shell-completion/bash/journalctl \
+ shell-completion/bash/systemctl \
+ shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
@@
-340,6
+342,8
@@
dist_systemunit_DATA = \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
+ units/initrd-fs.target \
+ units/initrd-fs-pre.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
@@
-379,7
+383,12
@@
dist_systemunit_DATA = \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
- units/system-update.target
+ units/system-update.target \
+ units/initrd-parse-etc.service \
+ units/initrd-cleanup.service \
+ units/initrd-switch-root.target \
+ units/initrd-udevadm-cleanup-db.service \
+ units/initrd-switch-root.service
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-2366,13
+2375,6
@@
journalctl_LDADD += \
$(QRENCODE_LIBS)
endif
$(QRENCODE_LIBS)
endif
-systemd_coredumpctl_SOURCES = \
- src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-journal.la
-
test_journal_SOURCES = \
src/journal/test-journal.c
test_journal_SOURCES = \
src/journal/test-journal.c
@@
-2617,7
+2619,6
@@
rootbin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
- systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
systemd-cat
dist_systemunit_DATA += \
@@
-2709,6
+2710,19
@@
endif
rootlibexec_PROGRAMS += \
systemd-coredump
rootlibexec_PROGRAMS += \
systemd-coredump
+systemd_coredumpctl_SOURCES = \
+ src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal.la
+
+bin_PROGRAMS += \
+ systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/systemd-coredumpctl
+
sysctl_DATA = \
sysctl.d/coredump.conf
sysctl_DATA = \
sysctl.d/coredump.conf
@@
-2967,6
+2981,9
@@
hostnamectl_LDADD = \
bin_PROGRAMS += \
hostnamectl
bin_PROGRAMS += \
hostnamectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/hostnamectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3040,6
+3057,9
@@
localectl_LDADD = \
bin_PROGRAMS += \
localectl
bin_PROGRAMS += \
localectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/localectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3106,6
+3126,9
@@
timedatectl_LDADD = \
bin_PROGRAMS += \
timedatectl
bin_PROGRAMS += \
timedatectl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/timedatectl
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3228,6
+3251,9
@@
loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
rootbin_PROGRAMS += \
loginctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/loginctl
+
systemd_inhibit_SOURCES = \
src/login/inhibit.c
systemd_inhibit_SOURCES = \
src/login/inhibit.c
@@
-3484,7
+3510,7
@@
sphinx-%:
$(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
destdir-sphinx: all
$(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
destdir-sphinx: all
- dir="
`mktemp -d /tmp/systemd-install.XXXXXX`
" && \
+ dir="
$(mktemp -d /tmp/systemd-install.XXXXXX)
" && \
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
@@
-3777,6
+3803,7
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
+ --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr