Prep v225: Applying various fixes and changes to src/libelogind/sd-bus that got lost...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6234d4bff938db82d2c6bed36b4a7de49ecd9dd5..87c4565f10d95e3e33b7b21490915fa24e26a5ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=10
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=10

-LIBELOGIND_REVISION=1
+LIBELOGIND_REVISION=2

 LIBELOGIND_AGE=10
 
 # Dirs of external packages
 LIBELOGIND_AGE=10
 
 # Dirs of external packages


@@ -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