chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Applying various fixes and changes to src/libelogind/sd-event that got...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 639fd577a108108b4fd4152b53e725c6549be996..87c4565f10d95e3e33b7b21490915fa24e26a5ac 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-38,9
+38,9
@@
SUBDIRS = . po
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
# 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@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-188,9
+188,6
@@
rootbin_PROGRAMS =
bin_PROGRAMS =
rootlibexec_PROGRAMS =
bin_PROGRAMS =
rootlibexec_PROGRAMS =
-dist_bashcompletion_DATA =
-dist_zshcompletion_DATA =
-
dist_doc_DATA = \
README \
NEWS \
dist_doc_DATA = \
README \
NEWS \
@@
-397,8
+394,6
@@
libshared_la_SOURCES = \
src/shared/pager.h \
src/shared/spawn-polkit-agent.c \
src/shared/spawn-polkit-agent.h \
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 \
src/shared/clean-ipc.c \
src/shared/clean-ipc.h \
src/shared/cgroup-show.c \
@@
-406,12
+401,6
@@
libshared_la_SOURCES = \
src/shared/bus-util.c \
src/shared/bus-util.h
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 \
if HAVE_ACL
libshared_la_SOURCES += \
src/shared/acl-util.c \
@@
-698,12
+687,16
@@
loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
rootbin_PROGRAMS += \
loginctl
-dist_bashcompletion_DATA += \
+if ENABLE_BASH_COMPLETION
+dist_bashcompletion_DATA = \
shell-completion/bash/loginctl
shell-completion/bash/loginctl
+endif
-dist_zshcompletion_DATA += \
+if ENABLE_ZSH_COMPLETION
+dist_zshcompletion_DATA = \
shell-completion/zsh/_loginctl \
shell-completion/zsh/_elogind-inhibit
shell-completion/zsh/_loginctl \
shell-completion/zsh/_elogind-inhibit
+endif
elogind_inhibit_SOURCES = \
src/login/inhibit.c
elogind_inhibit_SOURCES = \
src/login/inhibit.c
@@
-835,7
+828,6
@@
substitutions = \
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
'|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)|' \
'|NTP_SERVERS=$(NTP_SERVERS)|' \
'|DNS_SERVERS=$(DNS_SERVERS)|' \
'|systemuidmax=$(SYSTEM_UID_MAX)|' \