]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
build-sys: Do not install README.md as end-user documentation
[thirdparty/systemd.git] / Makefile.am
index c1516db087770a19c8f5b5e2f0d7422b131630f2..e178bdcb99d10167cc26df3e771ccae25ad72da9 100644 (file)
@@ -39,12 +39,12 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=7
+LIBSYSTEMD_CURRENT=9
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=7
+LIBSYSTEMD_AGE=9
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -137,7 +137,6 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 nodist_pkgsysconf_DATA =
-dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 dist_systemunit_DATA_busnames =
@@ -338,10 +337,8 @@ INSTALL_EXEC_HOOKS += \
        install-aliases-hook \
        install-touch-usr-hook
 
-if ENABLE_KDBUS
 INSTALL_EXEC_HOOKS += \
        install-busnames-target-wants-hook
-endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -436,6 +433,7 @@ nodist_bashcompletion_DATA = \
        shell-completion/bash/systemctl
 
 dist_zshcompletion_DATA = \
+       shell-completion/zsh/_busctl \
        shell-completion/zsh/_journalctl \
        shell-completion/zsh/_udevadm \
        shell-completion/zsh/_kernel-install \
@@ -522,10 +520,8 @@ dist_systemunit_DATA = \
        units/initrd-switch-root.target \
        units/machines.target
 
-if ENABLE_KDBUS
 dist_systemunit_DATA += \
        $(dist_systemunit_DATA_busnames)
-endif
 
 dist_systemunit_DATA_busnames += \
        units/busnames.target
@@ -644,6 +640,7 @@ UNINSTALL_DATA_HOOKS += units-uninstall-hook
 dist_doc_DATA = \
        README \
        NEWS \
+       CODING_STYLE \
        LICENSE.LGPL2.1 \
        LICENSE.GPL2 \
        DISTRO_PORTING \
@@ -651,6 +648,15 @@ dist_doc_DATA = \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
+EXTRA_DIST += \
+       README.md \
+       autogen.sh \
+       .dir-locals.el \
+       .vimrc \
+       .ycm_extra_conf.py \
+       .travis.yml \
+       .mailmap
+
 @INTLTOOL_POLICY_RULE@
 
 # ------------------------------------------------------------------------------
@@ -704,10 +710,13 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_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
@@ -725,23 +734,19 @@ CLEANFILES += \
        man/systemd.index.xml \
        man/systemd.directives.xml
 
+EXTRA_DIST += \
+       tools/make-man-rules.py
+
 endif
 
 endif
 
 EXTRA_DIST += \
-       $(XML_FILES) \
-       $(HTML_FILES) \
-       $(HTML_ALIAS) \
-       $(man_MANS) \
+       $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/xml_helper.py \
-       man/systemd.index.xml \
-       man/index.html \
-       man/systemd.directives.xml \
-       man/glib-event-glue.c \
-       $(NULL)
+       man/glib-event-glue.c
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1287,14 +1292,14 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
-audit_list_includes = -include linux/audit.h missing.h
+audit_list_includes = -include linux/audit.h -include missing.h
 if HAVE_AUDIT
 audit_list_includes += -include libaudit.h
 endif
 
 src/journal/audit_type-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/audit.h -include missing.h - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
 
 src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -2188,7 +2193,9 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf \
-       tmpfiles.d/home.conf
+       tmpfiles.d/home.conf \
+       tmpfiles.d/systemd-nspawn.conf \
+       tmpfiles.d/journal-nocow.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -2565,7 +2572,10 @@ stub_sources = \
        src/boot/efi/linux.c \
        src/boot/efi/stub.c
 
-EXTRA_DIST += $(stub_sources) $(stub_headers)
+EXTRA_DIST += \
+       $(stub_sources) \
+       $(stub_headers) \
+       test/splash.bmp
 
 if ENABLE_EFI
 if HAVE_GNUEFI
@@ -2621,7 +2631,6 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
 systemgenerator_PROGRAMS +=  \
        systemd-dbus1-generator
 
@@ -2644,7 +2653,6 @@ dist_xinitrc_SCRIPTS = \
 
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-endif
 
 # ------------------------------------------------------------------------------
 systemd_sysv_generator_SOURCES = \
@@ -2792,7 +2800,6 @@ systemd_stdio_bridge_LDADD = \
        libbus-proxy-core.la \
        libshared.la
 
-if ENABLE_KDBUS
 nodist_systemunit_DATA += \
        units/systemd-bus-proxyd.service
 
@@ -2804,7 +2811,6 @@ nodist_userunit_DATA += \
 
 dist_userunit_DATA += \
        units/user/systemd-bus-proxyd.socket
-endif
 
 EXTRA_DIST += \
        units/systemd-bus-proxyd.service.m4.in \
@@ -2840,6 +2846,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-hwdb.h \
        src/systemd/sd-device.h \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2916,9 +2923,6 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-resolve/sd-resolve.c \
        src/libsystemd/sd-resolve/resolve-util.h
 
-nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym
-
 libsystemd_internal_la_LIBADD = \
        libbasic.la \
        -lresolv
@@ -2927,14 +2931,10 @@ noinst_LTLIBRARIES += \
        libsystemd-internal.la
 
 EXTRA_DIST += \
-       src/libsystemd/libsystemd.sym.m4 \
        src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-BUILT_SOURCES += \
-       src/libsystemd/libsystemd.sym
-
 libsystemd_la_SOURCES = \
        $(libsystemd_internal_la_SOURCES) \
        $(libsystemd_journal_internal_la_SOURCES)
@@ -2949,7 +2949,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
        $(libsystemd_internal_la_LIBADD) \
@@ -2976,14 +2976,6 @@ pkginclude_HEADERS += \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h
 
-if ENABLE_KDBUS
-pkginclude_HEADERS += \
-       src/systemd/sd-utf8.h \
-       src/systemd/sd-netlink.h \
-       src/systemd/sd-resolve.h \
-       src/systemd/sd-path.h
-endif
-
 lib_LTLIBRARIES += \
        libsystemd.la
 
@@ -3312,8 +3304,8 @@ noinst_PROGRAMS += \
        systemd-modeset \
        systemd-subterm
 
-dist_pkgdata_DATA += \
-       src/libsystemd-terminal/unifont-glyph-array.bin
+pkgdata_DATA = \
+       src/libsystemd-terminal/unifont-glyph-array.bin
 
 nodist_userunit_DATA += \
        units/user/systemd-consoled.service
@@ -3459,10 +3451,6 @@ libudev_la_SOURCES =\
        src/libudev/libudev-queue.c \
        src/libudev/libudev-hwdb.c
 
-libudev_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
 libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
@@ -3494,10 +3482,6 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
        $(libudev_la_SOURCES)
 
-libudev_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default
-
 # ------------------------------------------------------------------------------
 INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d
@@ -3508,7 +3492,6 @@ dist_network_DATA = \
        network/80-container-ve.network
 
 dist_udevrules_DATA += \
-       rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
        rules/60-block.rules \
        rules/60-drm.rules \
@@ -3520,7 +3503,6 @@ dist_udevrules_DATA += \
        rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
-       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/78-sound-card.rules \
        rules/80-net-setup-link.rules
@@ -3689,8 +3671,7 @@ dist_udevhwdb_DATA = \
        hwdb/60-evdev.hwdb \
        hwdb/60-keyboard.hwdb \
        hwdb/70-mouse.hwdb \
-       hwdb/70-pointingstick.hwdb \
-       hwdb/70-touchpad.hwdb
+       hwdb/70-pointingstick.hwdb
 
 SYSINIT_TARGET_WANTS += \
        systemd-hwdb-update.service
@@ -3714,18 +3695,15 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 TESTS += \
-       test/udev-test.pl \
-       $(NULL)
+       test/udev-test.pl
 
 if HAVE_PYTHON
 TESTS += \
-       test/rule-syntax-check.py \
-       $(NULL)
+       test/rule-syntax-check.py
 
 if HAVE_SYSV_COMPAT
 TESTS += \
-       test/sysv-generator-test.py \
-       $(NULL)
+       test/sysv-generator-test.py
 endif
 endif
 
@@ -3764,9 +3742,7 @@ EXTRA_DIST += \
        test/udev-test.pl \
        test/rule-syntax-check.py \
        test/sysv-generator-test.py \
-       test/mocks/fsck \
-       $(NULL)
-
+       test/mocks/fsck
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -3830,19 +3806,6 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
        rules/60-persistent-v4l.rules
 
-# ------------------------------------------------------------------------------
-accelerometer_SOURCES = \
-       src/udev/accelerometer/accelerometer.c
-
-accelerometer_LDADD = \
-       libshared.la
-
-udevlibexec_PROGRAMS += \
-       accelerometer
-
-dist_udevrules_DATA += \
-       rules/61-accelerometer.rules
-
 # ------------------------------------------------------------------------------
 mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.c \
@@ -3944,7 +3907,6 @@ journal-remote-install-hook: journal-install-hook
        -chmod 755 $(DESTDIR)/var/log/journal/remote
 
 INSTALL_EXEC_HOOKS += journal-remote-install-hook
-
 endif
 
 nodist_pkgsysconf_DATA += \
@@ -3952,8 +3914,8 @@ nodist_pkgsysconf_DATA += \
 
 EXTRA_DIST += \
        units/systemd-journal-remote.service.in \
-       src/journal-remote/journal-remote.conf.in
-
+       src/journal-remote/journal-remote.conf.in \
+       src/journal-remote/log-generator.py
 endif
 
 if HAVE_LIBCURL
@@ -3978,7 +3940,6 @@ nodist_systemunit_DATA += \
 
 nodist_pkgsysconf_DATA += \
        src/journal-remote/journal-upload.conf
-
 endif
 
 EXTRA_DIST += \
@@ -4712,7 +4673,7 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.locale1.busname
 
-dist_pkgdata_DATA += \
+dist_pkgdata_DATA = \
        src/locale/kbd-model-map \
        src/locale/language-fallback-map
 
@@ -5538,8 +5499,7 @@ pam_systemd_la_SOURCES = \
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       -fvisibility=hidden
+       $(PAM_CFLAGS)
 
 pam_systemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -5639,163 +5599,28 @@ EXTRA_DIST += \
        units/systemd-user-sessions.service.in
 
 # ------------------------------------------------------------------------------
+EXTRA_DIST += \
+       test/Makefile \
+       test/README.testsuite \
+       test/TEST-01-BASIC \
+       test/TEST-01-BASIC/Makefile \
+       test/TEST-01-BASIC/test.sh \
+       test/TEST-02-CRYPTSETUP \
+       test/TEST-02-CRYPTSETUP/Makefile \
+       test/TEST-02-CRYPTSETUP/test.sh \
+       test/TEST-03-JOBS \
+       test/TEST-03-JOBS/Makefile \
+       test/TEST-03-JOBS/test-jobs.sh \
+       test/TEST-03-JOBS/test.sh \
+       test/test-functions
 
-if HAVE_PYTHON_DEVEL
-pkgpyexec_LTLIBRARIES = \
-       _journal.la \
-       id128.la \
-       _daemon.la \
-       _reader.la \
-       login.la
-
-_journal_la_SOURCES = \
-       src/python-systemd/_journal.c
-
-_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_journal_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
-
-id128_la_SOURCES = \
-       src/python-systemd/id128.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-nodist_id128_la_SOURCES = \
-       src/python-systemd/id128-constants.h
-
-id128_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-id128_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-id128_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_daemon_la_SOURCES = \
-       src/python-systemd/_daemon.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_daemon_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_reader_la_SOURCES = \
-       src/python-systemd/_reader.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_reader_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_reader_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_reader_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-login_la_SOURCES = \
-       src/python-systemd/login.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-login_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-login_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-login_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-dist_pkgpyexec_PYTHON = \
-       src/python-systemd/journal.py \
-       src/python-systemd/daemon.py \
-       src/python-systemd/__init__.py
-
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
-
-BUILT_SOURCES += \
-       $(nodist_id128_la_SOURCES)
-
-SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
-sphinx-%:
-       $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
-       $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
-       $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
-
-python-shell:
-       $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
-       $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
-
-destdir-sphinx: all
-       dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
-               $(MAKE) DESTDIR="$$dir" install && \
-               $(MAKE) DESTDIR="$$dir" sphinx-html && \
-               rm -rf "$$dir"
-
-endif
-
-CLEAN_LOCAL_HOOKS += clean-sphinx
-
-.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
-
-clean-sphinx:
-       -rm -rf docs/html/python-systemd/
-
-# Remove Python stuff, e.g. to force rebuilding for a different Python version.
-clean-python:
-       -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
-       -rm -f _daemon.la id128.la _journal.la login.la _reader.la
+EXTRA_DIST += \
+       test/loopy2.service \
+       test/loopy3.service \
+       test/loopy4.service \
+       test/loopy.service \
+       test/loopy.service.d \
+       test/loopy.service.d/compat.conf
 
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
@@ -5809,8 +5634,10 @@ BUILT_SOURCES += \
        libsystemd-id128.c \
        libsystemd-daemon.c
 
+nodist_libsystemd_journal_la_SOURCES = \
+       libsystemd-journal.c
+
 libsystemd_journal_la_SOURCES = \
-       libsystemd-journal.c \
        src/compat-libs/libsystemd-journal.sym
 
 libsystemd_journal_la_CPPFLAGS = \
@@ -5826,8 +5653,10 @@ libsystemd_journal_la_LIBADD = \
        libsystemd-journal-internal.la \
        libsystemd-internal.la
 
+nodist_libsystemd_login_la_SOURCES = \
+       libsystemd-login.c
+
 libsystemd_login_la_SOURCES = \
-       libsystemd-login.c \
        src/compat-libs/libsystemd-login.sym
 
 libsystemd_login_la_CPPFLAGS = \
@@ -5842,8 +5671,10 @@ libsystemd_login_la_LDFLAGS = \
 libsystemd_login_la_LIBADD = \
        libsystemd-internal.la
 
+nodist_libsystemd_id128_la_SOURCES = \
+       libsystemd-id128.c
+
 libsystemd_id128_la_SOURCES = \
-       libsystemd-id128.c \
        src/compat-libs/libsystemd-id128.sym
 
 libsystemd_id128_la_CPPFLAGS = \
@@ -5858,8 +5689,10 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd-internal.la
 
+nodist_libsystemd_daemon_la_SOURCES = \
+       libsystemd-daemon.c
+
 libsystemd_daemon_la_SOURCES = \
-       libsystemd-daemon.c \
        src/compat-libs/libsystemd-daemon.sym
 
 libsystemd_daemon_la_CPPFLAGS = \
@@ -5961,13 +5794,13 @@ 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)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \
        '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
        '|binfmtdir=$(binfmtdir)|' \
        '|modulesloaddir=$(modulesloaddir)|'
 
@@ -6187,10 +6020,8 @@ USER_UNIT_ALIASES += \
        $(systemunitdir)/sound.target sound.target \
        $(systemunitdir)/smartcard.target smartcard.target
 
-if ENABLE_KDBUS
 USER_UNIT_ALIASES += \
        $(systemunitdir)/busnames.target busnames.target
-endif
 
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@ -6251,7 +6082,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
-       --enable-kdbus \
        --enable-compat-libs
 
 if HAVE_SYSV_COMPAT
@@ -6264,11 +6094,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-python
-endif
-
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-split-usr
@@ -6312,24 +6137,19 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
-.PHONY: kdbus-update
-kdbus-update:
-       ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
-       wget -N https://d-bus.googlecode.com/git/kdbus.h )
-
 .PHONY: git-tag
 git-tag:
        git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
 
+.PHONY: git-tar
+git-tar:
+       git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
+
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
-.PHONY: upload
-upload: all check dist
-       scp systemd-$(VERSION).tar.xz $(www_target)
 
 .PHONY: doc-sync
 doc-sync: all destdir-sphinx
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
-       rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
 .PHONY: gardel
 gardel: upload
@@ -6361,7 +6181,7 @@ exported-%: %
        $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
 
 exported: $(addprefix exported-, $(lib_LTLIBRARIES))
-       $(AM_V_GEN)cat $^ > $@
+       $(AM_V_GEN)sort -u $^ > $@
 
 .PHONY: check-api-docs
 check-api-docs: exported man
@@ -6426,12 +6246,12 @@ test-libudev-sym.c: \
                src/udev/udev.h
        $(generate-sym-test)
 
-test_libsystemd_sym_SOURCES = \
+nodist_test_libsystemd_sym_SOURCES = \
        test-libsystemd-sym.c
 test_libsystemd_sym_LDADD = \
        libsystemd.la
 
-test_libudev_sym_SOURCES = \
+nodist_test_libudev_sym_SOURCES = \
        test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
        $(AM_CFLAGS) \
@@ -6440,8 +6260,12 @@ test_libudev_sym_LDADD = \
        libudev.la
 
 BUILT_SOURCES += \
-       $(test_libsystemd_sym_SOURCES) \
-       $(test_libudev_sym_SOURCES)
+       test-libsystemd-sym.c \
+       test-libudev-sym.c
+
+CLEANFILES += \
+       test-libsystemd-sym.c \
+       test-libudev-sym.c
 
 tests += \
        test-libsystemd-sym \