basic: add LIST_INSERT_BEFORE

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1cb1c2063394f7be17ae9de990b2c6112fbc74da..54c2aeeafd87c363a9f0fa92853f9e7bbe90c2a3 100644 (file)
--- 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=1
+LIBELOGIND_AGE=10
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -241,6 +241,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 +397,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 +404,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 \
@@ -796,7 +827,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)|' \