X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=741804814c9b1f82ea66d5d2c6baaa8f4a774c28;hp=1cb1c2063394f7be17ae9de990b2c6112fbc74da;hb=16ffa6bfe836f9b0fa5f1dd10d9cc774b9955a0b;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927

diff --git a/Makefile.am b/Makefile.am
index 1cb1c2063..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=8
-LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=8
+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 \
@@ -241,6 +240,45 @@ noinst_DATA += \
 CLEANFILES += \
 	docs/html/man
 
+if HAVE_PYTHON
+man/index.html: man/systemd.index.html
+	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
+
+noinst_DATA += \
+	man/index.html
+
+CLEANFILES += \
+	man/index.html
+
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
+
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
+	$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
+	$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
+	@echo "Makefile-man.am has been regenerated"
+
+man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
+
+man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
+
+CLEANFILES += \
+	man/systemd.index.xml \
+	man/systemd.directives.xml
+
+EXTRA_DIST += \
+	tools/make-man-rules.py
+
+endif
+
 endif
 
 EXTRA_DIST += \
@@ -358,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 \
@@ -367,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 \
@@ -496,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 \
@@ -514,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 \
@@ -659,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
@@ -796,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)|' \