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 _udevadm
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 8ac1d8d0f3d9bf526e0d266424f9487a1d501134..c96c8b1b73a1b1c97a93bcf6f35615ebc1eeccdf 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-68,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)
@@
-342,6
+343,12
@@
dist_bashcompletion_DATA = \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
+dist_zshcompletion_DATA = \
+ shell-completion/zsh/_systemctl \
+ shell-completion/zsh/_journalctl \
+ shell-completion/zsh/_udevadm \
+ shell-completion/zsh/_systemd
+
dist_sysctl_DATA = \
sysctl.d/50-default.conf
dist_sysctl_DATA = \
sysctl.d/50-default.conf
@@
-1835,6
+1842,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
@@
-3095,6
+3105,9
@@
bin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/systemd-coredumpctl
dist_bashcompletion_DATA += \
shell-completion/bash/systemd-coredumpctl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_systemd-coredumpctl
+
sysctl_DATA = \
sysctl.d/50-coredump.conf
sysctl_DATA = \
sysctl.d/50-coredump.conf
@@
-3355,6
+3368,9
@@
bin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/hostnamectl
dist_bashcompletion_DATA += \
shell-completion/bash/hostnamectl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_hostnamectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3431,6
+3447,9
@@
bin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/localectl
dist_bashcompletion_DATA += \
shell-completion/bash/localectl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_localectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3500,6
+3519,9
@@
bin_PROGRAMS += \
dist_bashcompletion_DATA += \
shell-completion/bash/timedatectl
dist_bashcompletion_DATA += \
shell-completion/bash/timedatectl
+
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_timedatectl
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3706,6
+3728,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
@@
-3905,7
+3930,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) \
@@
-3914,7
+3939,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 = \
@@
-3926,7
+3951,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 = \
@@
-3936,7
+3961,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 = \
@@
-3947,7
+3972,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 = \
@@
-3957,7
+3982,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 = \
@@
-3968,7
+3993,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) \
@@
-3977,7
+4002,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 \
@@
-3991,7
+4016,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) \
@@
-4000,7
+4025,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 \
@@
-4231,9
+4256,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
@@
-4348,6
+4370,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