X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=637a5367b19bd2761b2859d8cacf42fd9fd06864;hb=e2417e4143bb892e4599b01de7b031763421bb64;hp=730db1d5a888403b65fd687bd7c74a0808d39c53;hpb=b51fc639f01ee6194af3e7e944a79accce474fe1;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 730db1d5a..637a5367b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -469,7 +471,7 @@ MANPAGES = \
 	man/systemd.conf.5 \
 	man/tmpfiles.d.5 \
 	man/hostname.5 \
-	man/timezone.5 \
+	man/localtime.5 \
 	man/machine-id.5 \
 	man/locale.conf.5 \
 	man/os-release.5 \
@@ -682,8 +684,36 @@ man/index.html: make-man-index.py $(XML_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
+MANPAGES += \
+	man/systemd.directives.5
+
 EXTRA_DIST += \
 	man/index.html
+
+XML_DIRECTIVE_FILES = \
+	man/systemd.unit.xml \
+	man/systemd.service.xml \
+	man/systemd.socket.xml \
+	man/systemd.mount.xml \
+	man/systemd.automount.xml \
+	man/systemd.swap.xml \
+	man/systemd.target.xml \
+	man/systemd.path.xml \
+	man/systemd.timer.xml \
+	man/systemd.snapshot.xml \
+	man/systemd.exec.xml \
+	man/systemd.kill.xml \
+	man/systemd.device.xml \
+	man/systemd.conf.xml \
+	man/systemd.journal-fields.xml
+
+man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+	man/systemd.directives.xml
+
 endif
 
 endif
@@ -693,7 +723,8 @@ EXTRA_DIST += \
 	${XML_FILES:.xml=.html} \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS) \
-	make-man-index.py
+	make-man-index.py \
+	make-directive-index.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -946,6 +977,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-path.h \
 	src/core/cgroup.c \
 	src/core/cgroup.h \
+	src/core/selinux-access.c \
+	src/core/selinux-access.h \
 	src/core/selinux-setup.c \
 	src/core/selinux-setup.h \
 	src/core/ima-setup.c \
@@ -1706,6 +1739,7 @@ dist_udevrules_DATA += \
 	rules/60-persistent-input.rules \
 	rules/60-persistent-alsa.rules \
 	rules/60-persistent-storage.rules \
+	rules/64-btrfs.rules \
 	rules/75-net-description.rules \
 	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
@@ -1766,6 +1800,7 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-ctrl.c \
 	src/udev/udev-builtin.c \
 	src/udev/udev-builtin-blkid.c \
+	src/udev/udev-builtin-btrfs.c \
 	src/udev/udev-builtin-firmware.c \
 	src/udev/udev-builtin-hwdb.c \
 	src/udev/udev-builtin-input_id.c \
@@ -3408,6 +3443,37 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+if HAVE_PYTHON_DEVEL
+
+pkgpyexec_LTLIBRARIES = \
+	_journal.la
+
+_journal_la_SOURCES = \
+	src/python-systemd/_journal.c
+
+_journal_la_CFLAGS = \
+	$(AM_CFLAGS) \
+        -fvisibility=default \
+	$(PYTHON_CFLAGS)
+
+_journal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-module \
+	-avoid-version
+
+_journal_la_LIBADD = \
+	$(PYTHON_LIBS) \
+	libsystemd-journal.la
+
+dist_pkgpyexec_PYTHON = \
+	src/python-systemd/journal.py \
+	src/python-systemd/__init__.py
+
+endif
+
+# ------------------------------------------------------------------------------
+
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)	-e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -3419,6 +3485,8 @@ SED_PROCESS = \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
 		-e 's,@userunitdir\@,$(userunitdir),g' \
+		-e 's,@systempresetdir\@,$(systempresetdir),g' \
+		-e 's,@userpresetdir\@,$(userpresetdir),g' \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \