chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update TODO
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4e3b3605939428c35cace7012e13502a89f039ed..730db1d5a888403b65fd687bd7c74a0808d39c53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,29 +23,32 @@ AM_MAKEFLAGS = --no-print-directory
 
 SUBDIRS = . po
 
-LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=0
+# remove targets if the command fails
+.DELETE_ON_ERROR:
+
+LIBUDEV_CURRENT=2
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=2
+LIBSYSTEMD_DAEMON_REVISION=4
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=6
+LIBSYSTEMD_ID128_REVISION=9
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=2
-LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=2
+LIBSYSTEMD_JOURNAL_CURRENT=4
+LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_AGE=4
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -79,7 +82,7 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
-CLEANFILES =
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -92,6 +95,7 @@ lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
+polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
@@ -144,10 +148,11 @@ AM_CPPFLAGS = \
        -I $(top_builddir)/src/core \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
-       -I $(top_srcdir)/src/udev
+       -I $(top_srcdir)/src/udev \
+       $(OUR_CPPFLAGS)
 
-AM_CFLAGS = $(WARNINGFLAGS)
-AM_LDFLAGS = $(GCLDFLAGS)
+AM_CFLAGS = $(OUR_CFLAGS)
+AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
 if TARGET_GENTOO
@@ -377,12 +382,12 @@ EXTRA_DIST += \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \
        units/systemd-suspend.service.in \
+       units/quotaon.service.in \
        introspect.awk \
        man/custom-html.xsl
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-       units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -391,7 +396,6 @@ endif
 
 if TARGET_MANDRIVA
 dist_systemunit_DATA += \
-       units/mandriva/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -413,7 +417,6 @@ endif
 
 if TARGET_MAGEIA
 dist_systemunit_DATA += \
-       units/mageia/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -452,6 +455,7 @@ MANPAGES = \
        man/systemd.device.5 \
        man/systemd.snapshot.5 \
        man/systemd.exec.5 \
+       man/systemd.kill.5 \
        man/systemd.special.7 \
        man/systemd.journal-fields.7 \
        man/kernel-command-line.7 \
@@ -510,6 +514,7 @@ MANPAGES = \
        man/sd_journal_get_cutoff_realtime_usec.3 \
        man/sd_journal_get_cursor.3 \
        man/sd_journal_get_fd.3 \
+       man/sd_journal_get_usage.3 \
        man/sd_journal_add_match.3 \
        man/sd_journal_seek_head.3
 
@@ -534,6 +539,7 @@ MANPAGES_ALIAS = \
        man/systemd-poweroff.service.8 \
        man/systemd-reboot.service.8 \
        man/systemd-kexec.service.8 \
+       man/systemd-fsck.8 \
        man/systemd-fsck-root.service.8 \
        man/systemd-ask-password-console.path.8 \
        man/systemd-ask-password-wall.service.8 \
@@ -551,6 +557,7 @@ MANPAGES_ALIAS = \
        man/sd_journal_printv.3 \
        man/sd_journal_send.3 \
        man/sd_journal_sendv.3 \
+       man/sd_journal_perror.3 \
        man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
        man/sd_journal_open_directory.3 \
        man/sd_journal_close.3 \
@@ -600,6 +607,7 @@ man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
 man/systemd-reboot.service.8: man/systemd-halt.service.8
 man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
@@ -617,6 +625,7 @@ man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
 man/sd_journal_printv.3: man/sd_journal_print.3
 man/sd_journal_send.3: man/sd_journal_print.3
 man/sd_journal_sendv.3: man/sd_journal_print.3
+man/sd_journal_perror.3: man/sd_journal_print.3
 man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
 man/sd_journal_open_directory.3: man/sd_journal_open.3
 man/sd_journal_close.3: man/sd_journal_open.3
@@ -669,9 +678,12 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
-man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@
+man/index.html: make-man-index.py $(XML_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+       man/index.html
 endif
 
 endif
@@ -898,6 +910,8 @@ libsystemd_core_la_SOURCES = \
        src/core/load-dropin.h \
        src/core/execute.c \
        src/core/execute.h \
+       src/core/kill.c \
+       src/core/kill.h \
        src/core/dbus.c \
        src/core/dbus.h \
        src/core/dbus-manager.c \
@@ -926,6 +940,8 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-device.h \
        src/core/dbus-execute.c \
        src/core/dbus-execute.h \
+       src/core/dbus-kill.c \
+       src/core/dbus-kill.h \
        src/core/dbus-path.c \
        src/core/dbus-path.h \
        src/core/cgroup.c \
@@ -989,6 +1005,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
+       libsystemd-id128-internal.la \
        libudev.la \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
@@ -997,8 +1014,8 @@ libsystemd_core_la_LIBADD = \
        $(KMOD_LIBS)
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
 EXTRA_DIST += \
        src/core/load-fragment-gperf.gperf.m4
@@ -1008,25 +1025,27 @@ CLEANFILES += \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c \
        src/core/syscall-list.txt \
-       src/core/syscall-from-name.gperf \
-       src/core/syscall-from-name.h \
-       src/core/syscall-to-name.h
+       src/core/syscall-from-name.gperf
 
 BUILT_SOURCES += \
        src/core/syscall-from-name.h \
        src/core/syscall-to-name.h
 
 src/core/syscall-list.txt: Makefile
-       $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
 
 src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
 
 src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
 
 src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
@@ -1101,13 +1120,16 @@ noinst_PROGRAMS += \
        test-strv \
        test-install \
        test-watchdog \
-       test-unit-name
+       test-unit-name \
+       test-log \
+       test-unit-file
 
 TESTS += \
        test-job-type \
        test-env-replace \
        test-strv \
-       test-unit-name
+       test-unit-name \
+       test-unit-file
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1157,6 +1179,18 @@ test_unit_name_SOURCES = \
 test_unit_name_LDADD = \
        libsystemd-core.la
 
+test_unit_file_SOURCES = \
+       src/test/test-unit-file.c
+
+test_unit_file_LDADD = \
+       libsystemd-core.la
+
+test_log_SOURCES = \
+       src/test/test-log.c
+
+test_log_LDADD = \
+       libsystemd-core.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1273,7 +1307,8 @@ systemd_tmpfiles_SOURCES = \
 
 systemd_tmpfiles_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -1382,6 +1417,7 @@ systemd_remount_fs_SOURCES = \
        src/core/mount-setup.h
 
 systemd_remount_fs_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1409,8 +1445,6 @@ systemctl_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la \
        libsystemd-dbus.la \
        libsystemd-logs.la
 
@@ -1464,7 +1498,8 @@ systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon.la \
+       libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
@@ -1502,7 +1537,7 @@ pkginclude_HEADERS += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
@@ -1613,7 +1648,7 @@ CLEANFILES += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-move-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
@@ -1649,10 +1684,16 @@ MANPAGES += \
        man/systemd-udevd.service.8
 
 MANPAGES_ALIAS += \
-       man/systemd-udevd.8
+       man/systemd-udevd.8 \
+       man/systemd-udevd-control.socket.8 \
+       man/systemd-udevd-kernel.socket.8
+
+man/systemd-udevd.8: man/systemd-udevd.service.8
+man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
 
 udev-confdirs:
-       -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+       -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1698,10 +1739,10 @@ CLEANFILES += \
        units/systemd-udev-settle.service
 
 systemd-install-hook:
-       mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
+       $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sockets.target.wants
        ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
        ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
-       mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+       $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
        ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
@@ -1817,7 +1858,8 @@ check_DATA += \
 
 # packed sysfs test tree
 test/sys:
-       $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
        -rm -rf test/sys
@@ -1932,9 +1974,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
 pkgconfiglib_DATA += \
        src/gudev/gudev-1.0.pc
 
-EXTRA_DIST += \
-       src/gudev/gudev-1.0.pc.in
-
 CLEANFILES += \
        src/gudev/gudev-1.0.pc
 
@@ -1985,31 +2024,18 @@ libgudev_1_0_la_LDFLAGS = \
        -export-dynamic -no-undefined \
        -export-symbols-regex '^g_udev_.*'
 
-EXTRA_DIST += \
-       src/gudev/gudevmarshal.list \
-       src/gudev/gudevenumtypes.h.template \
-       src/gudev/gudevenumtypes.c.template \
-       src/gudev/gjs-example.js \
-       src/gudev/seed-example-enum.js \
-       src/gudev/seed-example.js
-
-CLEANFILES += \
-       $(nodist_libgudev_1_0_la_SOURCES)
-
 src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
 src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
-       $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)echo '#include "gudevmarshal.h"' > $@ && \
        glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
-       $(AM_V_GEN)glib-mkenums --template $^ > \
-           $@.tmp && mv $@.tmp $@
-
-src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
-       $(AM_V_GEN)glib-mkenums --template $^ > \
-           $@.tmp && mv $@.tmp $@
+src/gudev/gudevenumtypes.%: src/gudev/gudevenumtypes.%.template src/gudev/gudevenums.h
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)glib-mkenums --template $^ > $@
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
@@ -2034,16 +2060,16 @@ src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
        --warn-all
 
 src_gudev_GUdev_1_0_gir_FILES = \
-       $(top_srcdir)/src/gudev/gudev.h \
-       $(top_srcdir)/src/gudev/gudevtypes.h \
-       $(top_srcdir)/src/gudev/gudevenums.h \
-       $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
-       $(top_srcdir)/src/gudev/gudevclient.h \
-       $(top_srcdir)/src/gudev/gudevdevice.h \
-       $(top_srcdir)/src/gudev/gudevenumerator.h \
-       $(top_srcdir)/src/gudev/gudevclient.c \
-       $(top_srcdir)/src/gudev/gudevdevice.c \
-       $(top_srcdir)/src/gudev/gudevenumerator.c
+       src/gudev/gudev.h \
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevenumerator.h \
+       src/gudev/gudevclient.c \
+       src/gudev/gudevdevice.c \
+       src/gudev/gudevenumerator.c
 
 INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
 INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
@@ -2062,7 +2088,7 @@ endif # HAVE_INTROSPECTION
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libgudev-install-move-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
@@ -2076,6 +2102,16 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
 UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
 endif
 
+EXTRA_DIST += \
+       src/gudev/gudev-1.0.pc.in \
+       src/gudev/gudevmarshal.list \
+       src/gudev/gudevenumtypes.h.template \
+       src/gudev/gudevenumtypes.c.template \
+       src/gudev/gjs-example.js \
+       src/gudev/seed-example-enum.js \
+       src/gudev/seed-example.js
+
+
 # ------------------------------------------------------------------------------
 if ENABLE_KEYMAP
 keymap_SOURCES = \
@@ -2111,12 +2147,7 @@ dist_udevhome_SCRIPTS = \
 TESTS += \
        src/udev/keymap/check-keymaps.sh
 
-EXTRA_DIST += \
-       src/udev/keymap/check-keymaps.sh \
-       src/udev/keymap/keyboard-force-release.sh.in
-
 CLEANFILES += \
-       $(nodist_keymap_SOURCES) \
        src/udev/keymap/keys.txt \
        src/udev/keymap/keys-from-name.gperf \
        src/udev/keymap/keyboard-force-release.sh
@@ -2170,6 +2201,7 @@ dist_udevkeymap_DATA = \
        keymaps/module-sony \
        keymaps/module-sony-old \
        keymaps/module-sony-vgn \
+       keymaps/module-sony-vpc \
        keymaps/olpc-xo \
        keymaps/onkyo \
        keymaps/oqo-model2 \
@@ -2192,19 +2224,23 @@ dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
-       $(AM_V_at)mkdir -p src/udev/keymap
-       $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ || rm $@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
 src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ || rm $@
+       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
 src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ || rm $@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 endif
 
+EXTRA_DIST += \
+       src/udev/keymap/check-keymaps.sh \
+       src/udev/keymap/keyboard-force-release.sh.in
+
 # ------------------------------------------------------------------------------
 mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.c \
@@ -2268,7 +2304,7 @@ pkgconfiglib_DATA += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
@@ -2292,29 +2328,31 @@ EXTRA_DIST += \
 systemd_journald_SOURCES = \
        src/journal/journald.c \
        src/journal/journald.h \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/journal-file.h \
-       src/journal/lookup3.c \
-       src/journal/lookup3.h \
-       src/journal/journal-rate-limit.c \
-       src/journal/journal-rate-limit.h \
-       src/journal/sparse-endian.h \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/compress.h
+       src/journal/journald-kmsg.c \
+       src/journal/journald-kmsg.h \
+       src/journal/journald-syslog.c \
+       src/journal/journald-syslog.h \
+       src/journal/journald-stream.c \
+       src/journal/journald-stream.h \
+       src/journal/journald-console.c \
+       src/journal/journald-console.h \
+       src/journal/journald-native.c \
+       src/journal/journald-native.h \
+       src/journal/journald-rate-limit.c \
+       src/journal/journald-rate-limit.h \
+       src/journal/journal-internal.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
 
-systemd_journald_CFLAGS =
-
 systemd_journald_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-journal-internal.la \
+       libudev.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
@@ -2326,18 +2364,6 @@ systemd_journald_LDADD += \
        libsystemd-acl.la
 endif
 
-if HAVE_XZ
-systemd_journald_SOURCES += \
-       src/journal/compress.c
-
-systemd_journald_CFLAGS += \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-
-systemd_journald_LDADD += \
-       $(XZ_LIBS)
-endif
-
 systemd_cat_SOURCES = \
        src/journal/cat.c
 
@@ -2348,12 +2374,27 @@ systemd_cat_LDADD = \
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
+journalctl_CFLAGS = \
+       $(AM_CFLAGS)
+
 journalctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-logs.la
 
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+       src/journal/journal-qrcode.c \
+       src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+       $(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+       $(QRENCODE_LIBS)
+endif
+
 test_journal_SOURCES = \
        src/journal/test-journal.c
 
@@ -2386,11 +2427,31 @@ test_journal_stream_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_journal_verify_SOURCES = \
+       src/journal/test-journal-verify.c
+
+test_journal_verify_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
+       src/systemd/sd-journal.h \
        src/journal/journal-file.c \
+       src/journal/journal-file.h \
+       src/journal/journal-vacuum.c \
+       src/journal/journal-vacuum.h \
+       src/journal/journal-verify.c \
+       src/journal/journal-verify.h \
        src/journal/lookup3.c \
-       src/journal/journal-send.c
+       src/journal/lookup3.h \
+       src/journal/journal-send.c \
+       src/journal/sparse-endian.h \
+       src/journal/journal-def.h \
+       src/journal/compress.h \
+       src/journal/mmap-cache.c \
+       src/journal/mmap-cache.h
 
 libsystemd_journal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2409,30 +2470,55 @@ libsystemd_journal_la_LIBADD = \
 libsystemd_journal_internal_la_SOURCES = \
        $(libsystemd_journal_la_SOURCES)
 
+libsystemd_journal_internal_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
        src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
-       $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
-       $(AM_CFLAGS)
+libsystemd_journal_internal_la_CFLAGS += \
        $(XZ_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD = \
+libsystemd_journal_internal_la_LIBADD += \
        $(XZ_LIBS)
 
 endif
 
+if HAVE_GCRYPT
+libsystemd_journal_la_SOURCES += \
+       src/journal/journal-authenticate.c \
+       src/journal/journal-authenticate.h \
+       src/journal/fsprg.c \
+       src/journal/fsprg.h
+
+libsystemd_journal_la_CFLAGS += \
+       $(GCRYPT_CFLAGS) \
+       -Wno-pointer-arith
+
+libsystemd_journal_la_LIBADD += \
+       $(GCRYPT_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+       $(GCRYPT_CFLAGS) \
+       -Wno-pointer-arith
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(GCRYPT_LIBS)
+endif
+
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
@@ -2452,12 +2538,14 @@ noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
        test-journal-match \
-       test-journal-stream
+       test-journal-stream \
+       test-journal-verify
 
 TESTS += \
        test-journal \
        test-journal-match \
-       test-journal-stream
+       test-journal-stream \
+       test-journal-verify
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -2499,8 +2587,9 @@ journal-install-data-hook:
                rm -f systemd-journald.socket && \
                $(LN_S) ../systemd-journald.socket )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-journald.service && \
-               $(LN_S) ../systemd-journald.service )
+               rm -f systemd-journald.service systemd-journal-flush.service && \
+               $(LN_S) ../systemd-journald.service && \
+               $(LN_S) ../systemd-journal-flush.service )
 
 INSTALL_DATA_HOOKS += \
        journal-install-data-hook
@@ -2536,13 +2625,13 @@ rootlibexec_PROGRAMS += \
 sysctl_DATA = \
        sysctl.d/coredump.conf
 
-EXTRA_DIST += \
-       sysctl.d/coredump.conf.in
-
 CLEANFILES += \
        sysctl.d/coredump.conf
 endif
 
+EXTRA_DIST += \
+       sysctl.d/coredump.conf.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
@@ -2583,10 +2672,10 @@ MANPAGES_ALIAS +=  \
        man/systemd-binfmt.8
 
 man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_VCONSOLE
@@ -2620,10 +2709,10 @@ MANPAGES_ALIAS += \
        man/systemd-vconsole-setup.8
 
 man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
+endif
 
 EXTRA_DIST += \
        units/systemd-vconsole-setup.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_READAHEAD
@@ -2656,11 +2745,6 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service
 
-EXTRA_DIST += \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in
-
 MANPAGES += \
        man/sd_readahead.3 \
        man/sd-readahead.3 \
@@ -2679,6 +2763,11 @@ man/systemd-readahead.8: man/systemd-readahead-replay.service.8
 
 endif
 
+EXTRA_DIST += \
+       units/systemd-readahead-collect.service.in \
+       units/systemd-readahead-replay.service.in \
+       units/systemd-readahead-done.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
@@ -2687,9 +2776,6 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-quotacheck.service
 
-EXTRA_DIST += \
-       units/systemd-quotacheck.service.in
-
 systemd_quotacheck_SOURCES = \
        src/quotacheck/quotacheck.c
 
@@ -2706,6 +2792,12 @@ man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
 
 endif
 
+EXTRA_DIST += \
+       units/systemd-quotacheck.service.in
+
+nodist_systemunit_DATA += \
+       units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -2715,10 +2807,6 @@ nodist_systemunit_DATA += \
        units/systemd-random-seed-save.service \
        units/systemd-random-seed-load.service
 
-EXTRA_DIST += \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
-
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c
 
@@ -2752,6 +2840,10 @@ man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
 
 endif
 
+EXTRA_DIST += \
+       units/systemd-random-seed-save.service.in \
+       units/systemd-random-seed-load.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -2831,8 +2923,8 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
        src/hostname/org.freedesktop.hostname1.service
 
-polkitpolicy_in_files += \
-       src/hostname/org.freedesktop.hostname1.policy.in
+polkitpolicy_files += \
+       src/hostname/org.freedesktop.hostname1.policy
 
 dbusinterface_DATA += \
        org.freedesktop.hostname1.xml
@@ -2857,10 +2949,13 @@ MANPAGES_ALIAS += \
        man/systemd-hostnamed.8
 
 man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+endif
+
+polkitpolicy_in_files += \
+       src/hostname/org.freedesktop.hostname1.policy.in
 
 EXTRA_DIST += \
        units/systemd-hostnamed.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
@@ -2889,8 +2984,8 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
        src/locale/org.freedesktop.locale1.service
 
-polkitpolicy_in_files += \
-       src/locale/org.freedesktop.locale1.policy.in
+polkitpolicy_files += \
+       src/locale/org.freedesktop.locale1.policy
 
 dbusinterface_DATA += \
        org.freedesktop.locale1.xml
@@ -2916,9 +3011,6 @@ MANPAGES_ALIAS += \
 
 man/systemd-localed.8: man/systemd-localed.service.8
 
-EXTRA_DIST += \
-       units/systemd-localed.service.in
-
 dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
@@ -2930,6 +3022,12 @@ update-kbd-model-map:
 
 endif
 
+polkitpolicy_in_files += \
+       src/locale/org.freedesktop.locale1.policy.in
+
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
@@ -2956,8 +3054,8 @@ dist_dbuspolicy_DATA += \
 nodist_systemunit_DATA += \
        units/systemd-timedated.service
 
-polkitpolicy_in_files += \
-       src/timedate/org.freedesktop.timedate1.policy.in
+polkitpolicy_files += \
+       src/timedate/org.freedesktop.timedate1.policy
 
 org.freedesktop.timedate1.xml: systemd-timedated
        $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
@@ -2968,6 +3066,9 @@ dbusinterface_DATA += \
        org.freedesktop.timedate1.xml
 
 timedated-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \
+               $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.timedate1.service  && \
                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
@@ -2982,10 +3083,13 @@ MANPAGES_ALIAS += \
        man/systemd-timedated.8
 
 man/systemd-timedated.8: man/systemd-timedated.service.8
+endif
+
+polkitpolicy_in_files += \
+       src/timedate/org.freedesktop.timedate1.policy.in
 
 EXTRA_DIST += \
        units/systemd-timedated.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
@@ -3146,7 +3250,7 @@ endif
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-login-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
                ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
@@ -3187,8 +3291,8 @@ noinst_LTLIBRARIES += \
 pkgconfiglib_DATA += \
        src/login/libsystemd-login.pc
 
-polkitpolicy_in_files += \
-       src/login/org.freedesktop.login1.policy.in
+polkitpolicy_files += \
+       src/login/org.freedesktop.login1.policy
 
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -3238,7 +3342,6 @@ MANPAGES += \
        man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
-       man/systemd-logind.8 \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_flush.3 \
        man/sd_login_monitor_get_fd.3 \
@@ -3246,6 +3349,7 @@ MANPAGES_ALIAS += \
        man/sd_session_get_uid.3 \
        man/sd_session_get_seat.3 \
        man/sd_session_get_service.3 \
+       man/sd_session_get_state.3 \
        man/sd_session_get_type.3 \
        man/sd_session_get_class.3 \
        man/sd_session_get_display.3 \
@@ -3258,6 +3362,7 @@ MANPAGES_ALIAS += \
        man/sd_seat_can_multi_session.3 \
        man/sd_get_sessions.3 \
        man/sd_get_uids.3 \
+       man/systemd-logind.8 \
        man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
@@ -3268,6 +3373,7 @@ man/sd_login_monitor.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
 man/sd_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_state.3: man/sd_session_is_active.3
 man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_session_get_display.3: man/sd_session_is_active.3
@@ -3282,6 +3388,15 @@ man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
 man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 
+CLEANFILES += \
+       src/login/logind-gperf.c \
+       src/login/71-seat.rules \
+       src/login/73-seat-late.rules
+endif
+
+polkitpolicy_in_files += \
+       src/login/org.freedesktop.login1.policy.in
+
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
@@ -3291,11 +3406,6 @@ EXTRA_DIST += \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in
 
-CLEANFILES += \
-       src/login/logind-gperf.c \
-       src/login/71-seat.rules \
-       src/login/73-seat-late.rules
-endif
 # ------------------------------------------------------------------------------
 
 SED_PROCESS = \
@@ -3321,7 +3431,9 @@ SED_PROCESS = \
                -e 's,@rootprefix\@,$(rootprefix),g' \
                -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
                -e 's,@sushell\@,$(sushell),g' \
-               < $< > $@ || rm $@
+               -e 's,@QUOTAON\@,$(QUOTAON),g' \
+               -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
+               < $< > $@
 
 units/%: units/%.in Makefile
        $(SED_PROCESS)
@@ -3349,20 +3461,20 @@ src/%.policy.in: src/%.policy.in.in Makefile
        $(AM_V_GEN)chmod +x $@
 
 src/%.c: src/%.gperf
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(GPERF) < $< > $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(GPERF) < $< > $@
 
 src/%: src/%.m4
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(M4) -P $(M4_DEFINES) < $< > $@
 
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 M4_PROCESS_USER = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 units/%: units/%.m4 Makefile
        $(M4_PROCESS_SYSTEM)
@@ -3371,7 +3483,7 @@ units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
 nodist_polkitpolicy_DATA = \
-       $(polkitpolicy_in_files:.policy.in=.policy) \
+       $(polkitpolicy_files) \
        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
 
 EXTRA_DIST += \
@@ -3386,7 +3498,7 @@ CLEANFILES += \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA)
 
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
@@ -3418,7 +3530,7 @@ man/%.7: man/%.xml
 man/%.8: man/%.xml
        $(XSLTPROC_PROCESS_MAN)
 
-man/%.html: man/%.xml
+man/%.html: man/%.xml man/custom-html.xsl
        $(XSLTPROC_PROCESS_HTML)
 
 CLEANFILES += \
@@ -3426,7 +3538,7 @@ CLEANFILES += \
        ${XML_FILES:.xml=.html}
 endif
 
-DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 CLEANFILES += \
        $(dbusinterface_DATA)
@@ -3558,15 +3670,12 @@ systemd-install-data-hook:
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
-               $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) rescue.service single.service )
 endif
 
 if TARGET_MANDRIVA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service dm.service single.service && \
-               $(LN_S) prefdm.service display-manager.service && \
-               $(LN_S) prefdm.service dm.service && \
                $(LN_S) rescue.service single.service )
 endif
 
@@ -3584,9 +3693,7 @@ endif
 
 if TARGET_MAGEIA
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service && \
-               $(LN_S) prefdm.service dm.service )
+               rm -f display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
Unnamed repository; edit this file 'description' to name the repository.