X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=741804814c9b1f82ea66d5d2c6baaa8f4a774c28;hp=639fd577a108108b4fd4152b53e725c6549be996;hb=660d02b554b97fd4ce08d0a30d16487912687a13;hpb=1532f28b7cf3e6e02e74691450b2b5379be6b805 diff --git a/Makefile.am b/Makefile.am index 639fd577a..741804814 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,9 +38,9 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBELOGIND_CURRENT=9 -LIBELOGIND_REVISION=3 -LIBELOGIND_AGE=9 +LIBELOGIND_CURRENT=10 +LIBELOGIND_REVISION=2 +LIBELOGIND_AGE=10 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -134,6 +134,8 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ + -I $(top_srcdir)/src/libudev \ + -I $(top_srcdir)/src/udev \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/libelogind/sd-bus \ -I $(top_srcdir)/src/libelogind/sd-event \ @@ -188,9 +190,6 @@ rootbin_PROGRAMS = bin_PROGRAMS = rootlibexec_PROGRAMS = -dist_bashcompletion_DATA = -dist_zshcompletion_DATA = - dist_doc_DATA = \ README \ NEWS \ @@ -397,8 +396,6 @@ libshared_la_SOURCES = \ src/shared/pager.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ - src/shared/apparmor-util.c \ - src/shared/apparmor-util.h \ src/shared/clean-ipc.c \ src/shared/clean-ipc.h \ src/shared/cgroup-show.c \ @@ -406,12 +403,6 @@ libshared_la_SOURCES = \ src/shared/bus-util.c \ src/shared/bus-util.h -if HAVE_SECCOMP -libshared_la_SOURCES += \ - src/shared/seccomp-util.h \ - src/shared/seccomp-util.c -endif - if HAVE_ACL libshared_la_SOURCES += \ src/shared/acl-util.c \ @@ -535,6 +526,7 @@ libelogind_internal_la_SOURCES = \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ src/systemd/sd-event.h \ + src/systemd/sd-netlink.h \ src/systemd/sd-login.h \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ @@ -553,6 +545,8 @@ libelogind_internal_la_SOURCES = \ src/libelogind/sd-bus/bus-socket.h \ src/libelogind/sd-bus/bus-kernel.c \ src/libelogind/sd-bus/bus-kernel.h \ + src/libelogind/sd-bus/bus-container.c \ + src/libelogind/sd-bus/bus-container.h \ src/libelogind/sd-bus/bus-message.c \ src/libelogind/sd-bus/bus-message.h \ src/libelogind/sd-bus/bus-creds.c \ @@ -698,12 +692,16 @@ loginctl_LDADD = \ rootbin_PROGRAMS += \ loginctl -dist_bashcompletion_DATA += \ +if ENABLE_BASH_COMPLETION +dist_bashcompletion_DATA = \ shell-completion/bash/loginctl +endif -dist_zshcompletion_DATA += \ +if ENABLE_ZSH_COMPLETION +dist_zshcompletion_DATA = \ shell-completion/zsh/_loginctl \ shell-completion/zsh/_elogind-inhibit +endif elogind_inhibit_SOURCES = \ src/login/inhibit.c @@ -835,7 +833,6 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ - '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ '|NTP_SERVERS=$(NTP_SERVERS)|' \ '|DNS_SERVERS=$(DNS_SERVERS)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \