X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=9fa7944f37237af4ff4c97b3a23752f2c029c5fc;hp=3ece887b134dfc9bf7c910fef662ee74709a7321;hb=799d54be0b681c0329539fca604261994e7f8c0e;hpb=e7c431d3bcfdeeec5dcae0707145edb9a3f749aa diff --git a/Makefile.am b/Makefile.am index 3ece887b1..9fa7944f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=4 -LIBUDEV_REVISION=6 +LIBUDEV_REVISION=7 LIBUDEV_AGE=3 LIBGUDEV_CURRENT=1 @@ -43,7 +43,7 @@ LIBGUDEV_REVISION=3 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=8 -LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_REVISION=1 LIBSYSTEMD_LOGIN_AGE=8 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -51,11 +51,11 @@ LIBSYSTEMD_DAEMON_REVISION=10 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=23 +LIBSYSTEMD_ID128_REVISION=24 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=11 -LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_REVISION=1 LIBSYSTEMD_JOURNAL_AGE=11 # Dirs of external packages @@ -68,6 +68,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig 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) @@ -315,7 +316,6 @@ rootlibexec_PROGRAMS = \ systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ - systemd-timestamp \ systemd-ac-power \ systemd-sysctl \ systemd-sleep @@ -340,7 +340,12 @@ dist_bashcompletion_DATA = \ 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 @@ -752,6 +757,7 @@ libsystemd_label_la_SOURCES = \ 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 \ @@ -1606,13 +1612,6 @@ systemd_fsck_LDADD = \ 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 @@ -1841,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 +libsystemd_daemon_la_LIBADD = \ + $(RT_LIBS) + pkginclude_HEADERS += \ src/systemd/sd-daemon.h @@ -3712,6 +3714,9 @@ rootbin_PROGRAMS += \ dist_bashcompletion_DATA += \ shell-completion/bash/loginctl +dist_zshcompletion_DATA += \ + shell-completion/zsh/_loginctl + systemd_inhibit_SOURCES = \ src/login/inhibit.c @@ -3911,7 +3916,7 @@ _journal_la_SOURCES = \ _journal_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ - $(PYTHON_CFLAGS) + $(PYTHON_DEVEL_CFLAGS) _journal_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -3920,7 +3925,7 @@ _journal_la_LDFLAGS = \ -avoid-version _journal_la_LIBADD = \ - $(PYTHON_LIBS) \ + $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la id128_la_SOURCES = \ @@ -3932,7 +3937,7 @@ id128_la_SOURCES = \ id128_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ - $(PYTHON_CFLAGS) \ + $(PYTHON_DEVEL_CFLAGS) \ -I$(top_builddir)/src/python-systemd id128_la_LDFLAGS = \ @@ -3942,7 +3947,7 @@ id128_la_LDFLAGS = \ -avoid-version id128_la_LIBADD = \ - $(PYTHON_LIBS) \ + $(PYTHON_DEVEL_LIBS) \ libsystemd-id128.la _daemon_la_SOURCES = \ @@ -3953,7 +3958,7 @@ _daemon_la_SOURCES = \ _daemon_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ - $(PYTHON_CFLAGS) \ + $(PYTHON_DEVEL_CFLAGS) \ -I$(top_builddir)/src/python-systemd _daemon_la_LDFLAGS = \ @@ -3963,7 +3968,7 @@ _daemon_la_LDFLAGS = \ -avoid-version _daemon_la_LIBADD = \ - $(PYTHON_LIBS) \ + $(PYTHON_DEVEL_LIBS) \ libsystemd-daemon.la _reader_la_SOURCES = \ @@ -3974,7 +3979,7 @@ _reader_la_SOURCES = \ _reader_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ - $(PYTHON_CFLAGS) + $(PYTHON_DEVEL_CFLAGS) _reader_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -3983,7 +3988,7 @@ _reader_la_LDFLAGS = \ -avoid-version _reader_la_LIBADD = \ - $(PYTHON_LIBS) \ + $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la \ libsystemd-id128.la \ libsystemd-shared.la \ @@ -3997,7 +4002,7 @@ login_la_SOURCES = \ login_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ - $(PYTHON_CFLAGS) + $(PYTHON_DEVEL_CFLAGS) login_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4006,7 +4011,7 @@ login_la_LDFLAGS = \ -avoid-version login_la_LIBADD = \ - $(PYTHON_LIBS) \ + $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la \ libsystemd-login.la \ libsystemd-shared.la \ @@ -4237,9 +4242,6 @@ EXTRA_DIST += \ 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 @@ -4354,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-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-rootprefix=$$dc_install_base \ --disable-split-usr