X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4a0f5878be91bc2b7c98e7c39904fd88bcdc7e09;hp=9292e78a33ffb41a6b946228aee598a08b267743;hb=d228dab58edda06f13e9637cffb16f48a6a615cb;hpb=7f231684fd2943d4d5585022ec8595ea1b67cf8a

diff --git a/Makefile.am b/Makefile.am
index 9292e78a3..4a0f5878b 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=10
+LIBELOGIND_CURRENT=11
 LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=10
+LIBELOGIND_AGE=11
 
 # 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 \
@@ -363,7 +362,9 @@ libbasic_la_SOURCES = \
 	src/basic/fileio-label.c \
 	src/basic/fileio-label.h \
 	src/basic/rm-rf.c \
-	src/basic/rm-rf.h
+	src/basic/rm-rf.h \
+	src/basic/copy.c \
+	src/basic/copy.h
 
 nodist_libbasic_la_SOURCES = \
 	src/basic/errno-from-name.h \
@@ -397,8 +398,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 +405,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 +528,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 +547,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 +694,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