chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zsh_completion: Split out zsh _loginctl
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 7e6361c2e8f24a4d0ef2c7a01f97b718d03907f0..9fa7944f37237af4ff4c97b3a23752f2c029c5fc 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-31,8
+31,11
@@
SUBDIRS = . po
# keep intermediate files
.SECONDARY:
# keep intermediate files
.SECONDARY:
+# Keep the test-suite.log
+.PRECIOUS: $(TEST_SUITE_LOG) Makefile
+
LIBUDEV_CURRENT=4
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=
6
+LIBUDEV_REVISION=
7
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
@@
-40,7
+43,7
@@
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=8
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=8
-LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_REVISION=
1
LIBSYSTEMD_LOGIN_AGE=8
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=8
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-48,11
+51,11
@@
LIBSYSTEMD_DAEMON_REVISION=10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
3
+LIBSYSTEMD_ID128_REVISION=2
4
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_REVISION=
1
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
@@
-65,6
+68,7
@@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
+zshcompletiondir=@zshcompletiondir@
rpmmacrosdir=$(prefix)/lib/rpm/macros.d
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
rpmmacrosdir=$(prefix)/lib/rpm/macros.d
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@
-312,7
+316,6
@@
rootlibexec_PROGRAMS = \
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
- systemd-timestamp \
systemd-ac-power \
systemd-sysctl \
systemd-sleep
systemd-ac-power \
systemd-sysctl \
systemd-sleep
@@
-337,7
+340,12
@@
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
- shell-completion/bash/udevadm
+ shell-completion/bash/udevadm \
+ shell-completion/bash/kernel-install
+
+dist_zshcompletion_DATA = \
+ shell-completion/zsh/_systemctl \
+ shell-completion/zsh/_systemd
dist_sysctl_DATA = \
sysctl.d/50-default.conf
dist_sysctl_DATA = \
sysctl.d/50-default.conf
@@
-749,6
+757,7
@@
libsystemd_label_la_SOURCES = \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
src/shared/mkdir.c \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
src/shared/mkdir.c \
+ src/shared/mkdir-label.c \
src/shared/mkdir.h \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/mkdir.h \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
@@
-1603,13
+1612,6
@@
systemd_fsck_LDADD = \
libsystemd-dbus.la \
libudev.la
libsystemd-dbus.la \
libudev.la
-# ------------------------------------------------------------------------------
-systemd_timestamp_SOURCES = \
- src/timestamp/timestamp.c
-
-systemd_timestamp_LDADD = \
- libsystemd-shared.la
-
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
@@
-1838,6
+1840,9
@@
libsystemd_daemon_la_LDFLAGS = \
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
+libsystemd_daemon_la_LIBADD = \
+ $(RT_LIBS)
+
pkginclude_HEADERS += \
src/systemd/sd-daemon.h
pkginclude_HEADERS += \
src/systemd/sd-daemon.h
@@
-3709,6
+3714,9
@@
rootbin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/loginctl
dist_bashcompletion_DATA += \
shell-completion/bash/loginctl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_loginctl
+
systemd_inhibit_SOURCES = \
src/login/inhibit.c
systemd_inhibit_SOURCES = \
src/login/inhibit.c
@@
-3908,7
+3916,7
@@
_journal_la_SOURCES = \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- $(PYTHON_CFLAGS)
+ $(PYTHON_
DEVEL_
CFLAGS)
_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
@@
-3917,7
+3925,7
@@
_journal_la_LDFLAGS = \
-avoid-version
_journal_la_LIBADD = \
-avoid-version
_journal_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_
DEVEL_
LIBS) \
libsystemd-journal.la
id128_la_SOURCES = \
libsystemd-journal.la
id128_la_SOURCES = \
@@
-3929,7
+3937,7
@@
id128_la_SOURCES = \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- $(PYTHON_CFLAGS) \
+ $(PYTHON_
DEVEL_
CFLAGS) \
-I$(top_builddir)/src/python-systemd
id128_la_LDFLAGS = \
-I$(top_builddir)/src/python-systemd
id128_la_LDFLAGS = \
@@
-3939,7
+3947,7
@@
id128_la_LDFLAGS = \
-avoid-version
id128_la_LIBADD = \
-avoid-version
id128_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_
DEVEL_
LIBS) \
libsystemd-id128.la
_daemon_la_SOURCES = \
libsystemd-id128.la
_daemon_la_SOURCES = \
@@
-3950,7
+3958,7
@@
_daemon_la_SOURCES = \
_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- $(PYTHON_CFLAGS) \
+ $(PYTHON_
DEVEL_
CFLAGS) \
-I$(top_builddir)/src/python-systemd
_daemon_la_LDFLAGS = \
-I$(top_builddir)/src/python-systemd
_daemon_la_LDFLAGS = \
@@
-3960,7
+3968,7
@@
_daemon_la_LDFLAGS = \
-avoid-version
_daemon_la_LIBADD = \
-avoid-version
_daemon_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_
DEVEL_
LIBS) \
libsystemd-daemon.la
_reader_la_SOURCES = \
libsystemd-daemon.la
_reader_la_SOURCES = \
@@
-3971,7
+3979,7
@@
_reader_la_SOURCES = \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- $(PYTHON_CFLAGS)
+ $(PYTHON_
DEVEL_
CFLAGS)
_reader_la_LDFLAGS = \
$(AM_LDFLAGS) \
_reader_la_LDFLAGS = \
$(AM_LDFLAGS) \
@@
-3980,7
+3988,7
@@
_reader_la_LDFLAGS = \
-avoid-version
_reader_la_LIBADD = \
-avoid-version
_reader_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_
DEVEL_
LIBS) \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-shared.la \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-shared.la \
@@
-3994,7
+4002,7
@@
login_la_SOURCES = \
login_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
login_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
- $(PYTHON_CFLAGS)
+ $(PYTHON_
DEVEL_
CFLAGS)
login_la_LDFLAGS = \
$(AM_LDFLAGS) \
login_la_LDFLAGS = \
$(AM_LDFLAGS) \
@@
-4003,7
+4011,7
@@
login_la_LDFLAGS = \
-avoid-version
login_la_LIBADD = \
-avoid-version
login_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_
DEVEL_
LIBS) \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
@@
-4234,9
+4242,6
@@
EXTRA_DIST += \
docs/sysvinit/README.in \
docs/var-log/README.in
docs/sysvinit/README.in \
docs/var-log/README.in
-EXTRA_DIST += \
- shell-completion/systemd-zsh-completion.zsh
-
SOCKETS_TARGET_WANTS += \
systemd-initctl.socket \
systemd-shutdownd.socket
SOCKETS_TARGET_WANTS += \
systemd-initctl.socket \
systemd-shutdownd.socket
@@
-4351,6
+4356,7
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
+ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--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
~ianmdlvl / elogind.git / blobdiff