Merge pull request #288 from phomes/cgroup-util

[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am

index 7603b2c0e12b2f2df248ace45f9c83ad00f77bbf..936e4edd810531aa81ca0de7a3f3384855cfc515 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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=8
  LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=7
+LIBSYSTEMD_AGE=8
  
  # The following four libraries only exist for compatibility reasons,
  # their version info should not be bumped anymore
@@ -211,8 +211,10 @@ AM_CPPFLAGS = \
         -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
         -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
         -I $(top_srcdir)/src \
-       -I $(top_builddir)/src/shared \
+       -I $(top_builddir)/src/basic \
+       -I $(top_srcdir)/src/basic \
         -I $(top_srcdir)/src/shared \
+       -I $(top_builddir)/src/shared \
         -I $(top_srcdir)/src/network \
         -I $(top_srcdir)/src/login \
         -I $(top_srcdir)/src/journal \
@@ -230,7 +232,8 @@ AM_CPPFLAGS = \
         -I $(top_builddir)/src/udev \
         -I $(top_srcdir)/src/libsystemd/sd-bus \
         -I $(top_srcdir)/src/libsystemd/sd-event \
-       -I $(top_srcdir)/src/libsystemd/sd-rtnl \
+       -I $(top_srcdir)/src/libsystemd/sd-login \
+       -I $(top_srcdir)/src/libsystemd/sd-netlink \
         -I $(top_srcdir)/src/libsystemd/sd-network \
         -I $(top_srcdir)/src/libsystemd/sd-hwdb \
         -I $(top_srcdir)/src/libsystemd/sd-device \
@@ -335,10 +338,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))
@@ -519,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
@@ -701,11 +700,10 @@ noinst_DATA += \
  CLEANFILES += \
         man/index.html
  
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/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))}
  
-update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES)
         $(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"
@@ -714,9 +712,9 @@ man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FIL
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
  
-man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE_XML_FILES)
+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) $< $@ $(filter-out $<,$^)
+       $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
  
  CLEANFILES += \
         man/systemd.index.xml \
@@ -727,7 +725,7 @@ endif
  endif
  
  EXTRA_DIST += \
-       $(XML_FILES) \
+       $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
         $(HTML_FILES) \
         $(HTML_ALIAS) \
         $(man_MANS) \
@@ -736,36 +734,187 @@ EXTRA_DIST += \
         tools/xml_helper.py \
         man/systemd.index.xml \
         man/index.html \
-       man/systemd.directives.xml \
         man/glib-event-glue.c \
         $(NULL)
  
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
-       libsystemd-shared.la
+       libbasic.la
+
+libbasic_la_SOURCES = \
+       src/basic/missing.h \
+       src/basic/capability.c \
+       src/basic/capability.h \
+       src/basic/conf-files.c \
+       src/basic/conf-files.h \
+       src/basic/hostname-util.h \
+       src/basic/hostname-util.c \
+       src/basic/unit-name.c \
+       src/basic/unit-name.h \
+       src/basic/ioprio.h \
+       src/basic/securebits.h \
+       src/basic/special.h \
+       src/basic/list.h \
+       src/basic/unaligned.h \
+       src/basic/macro.h \
+       src/basic/def.h \
+       src/basic/sparse-endian.h \
+       src/basic/refcnt.h \
+       src/basic/util.c \
+       src/basic/util.h \
+       src/basic/lockfile-util.c \
+       src/basic/lockfile-util.h \
+       src/basic/path-util.c \
+       src/basic/path-util.h \
+       src/basic/time-util.c \
+       src/basic/time-util.h \
+       src/basic/locale-util.c \
+       src/basic/locale-util.h \
+       src/basic/signal-util.c \
+       src/basic/signal-util.h \
+       src/basic/mempool.c \
+       src/basic/mempool.h \
+       src/basic/hashmap.c \
+       src/basic/hashmap.h \
+       src/basic/siphash24.c \
+       src/basic/siphash24.h \
+       src/basic/set.h \
+       src/basic/ordered-set.h \
+       src/basic/fdset.c \
+       src/basic/fdset.h \
+       src/basic/prioq.c \
+       src/basic/prioq.h \
+       src/basic/strv.c \
+       src/basic/strv.h \
+       src/basic/env-util.c \
+       src/basic/env-util.h \
+       src/basic/strbuf.c \
+       src/basic/strbuf.h \
+       src/basic/strxcpyx.c \
+       src/basic/strxcpyx.h \
+       src/basic/log.c \
+       src/basic/log.h \
+       src/basic/bus-label.c \
+       src/basic/bus-label.h \
+       src/basic/ratelimit.h \
+       src/basic/ratelimit.c \
+       src/basic/exit-status.c \
+       src/basic/exit-status.h \
+       src/basic/virt.c \
+       src/basic/virt.h \
+       src/basic/smack-util.c \
+       src/basic/smack-util.h \
+       src/basic/device-nodes.c \
+       src/basic/device-nodes.h \
+       src/basic/utf8.c \
+       src/basic/utf8.h \
+       src/basic/gunicode.c \
+       src/basic/gunicode.h \
+       src/basic/socket-util.c \
+       src/basic/socket-util.h \
+       src/basic/in-addr-util.c \
+       src/basic/in-addr-util.h \
+       src/basic/ether-addr-util.h \
+       src/basic/replace-var.c \
+       src/basic/replace-var.h \
+       src/basic/clock-util.c \
+       src/basic/clock-util.h \
+       src/basic/calendarspec.c \
+       src/basic/calendarspec.h \
+       src/basic/fileio.c \
+       src/basic/fileio.h \
+       src/basic/MurmurHash2.c \
+       src/basic/MurmurHash2.h \
+       src/basic/mkdir.c \
+       src/basic/mkdir.h \
+       src/basic/cgroup-util.c \
+       src/basic/cgroup-util.h \
+       src/basic/errno-list.c \
+       src/basic/errno-list.h \
+       src/basic/af-list.c \
+       src/basic/af-list.h \
+       src/basic/arphrd-list.c \
+       src/basic/arphrd-list.h \
+       src/basic/terminal-util.c \
+       src/basic/terminal-util.h \
+       src/basic/login-util.h \
+       src/basic/login-util.c \
+       src/basic/cap-list.c \
+       src/basic/cap-list.h \
+       src/basic/audit.c \
+       src/basic/audit.h \
+       src/basic/xml.c \
+       src/basic/xml.h \
+       src/basic/json.c \
+       src/basic/json.h \
+       src/basic/ring.c \
+       src/basic/ring.h \
+       src/basic/barrier.c \
+       src/basic/barrier.h \
+       src/basic/async.c \
+       src/basic/async.h \
+       src/basic/memfd-util.c \
+       src/basic/memfd-util.h \
+       src/basic/process-util.c \
+       src/basic/process-util.h \
+       src/basic/random-util.c \
+       src/basic/random-util.h \
+       src/basic/verbs.c \
+       src/basic/verbs.h \
+       src/basic/sigbus.c \
+       src/basic/sigbus.h \
+       src/basic/build.h \
+       src/basic/socket-label.c \
+       src/basic/label.c \
+       src/basic/label.h \
+       src/basic/btrfs-util.c \
+       src/basic/btrfs-util.h \
+       src/basic/btrfs-ctree.h \
+       src/basic/selinux-util.c \
+       src/basic/selinux-util.h \
+       src/basic/mkdir-label.c \
+       src/basic/fileio-label.c \
+       src/basic/fileio-label.h \
+       src/basic/rm-rf.c \
+       src/basic/rm-rf.h \
+       src/basic/copy.c \
+       src/basic/copy.h
+
+nodist_libbasic_la_SOURCES = \
+       src/basic/errno-from-name.h \
+       src/basic/errno-to-name.h \
+       src/basic/af-from-name.h \
+       src/basic/af-to-name.h \
+       src/basic/arphrd-from-name.h \
+       src/basic/arphrd-to-name.h \
+       src/basic/cap-from-name.h \
+       src/basic/cap-to-name.h
+
+libbasic_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS) \
+       $(CAP_CFLAGS) \
+       -pthread
  
-libsystemd_shared_la_SOURCES = \
-       src/shared/capability.c \
-       src/shared/capability.h \
+libbasic_la_LIBADD = \
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS) \
+       -ldl \
+       -lrt \
+       -lm
+
+# -----------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libshared.la
+
+libshared_la_SOURCES = \
+       src/shared/output-mode.h \
+       src/shared/gpt.h \
+       src/shared/udev-util.h \
         src/shared/linux/auto_dev-ioctl.h \
-       src/shared/ioprio.h \
-       src/shared/missing.h \
         src/shared/initreq.h \
-       src/shared/securebits.h \
-       src/shared/special.h \
-       src/shared/list.h \
-       src/shared/unaligned.h \
-       src/shared/macro.h \
-       src/shared/def.h \
-       src/shared/sparse-endian.h \
-       src/shared/refcnt.h \
-       src/shared/udev-util.h \
-       src/shared/device-nodes.c \
-       src/shared/device-nodes.h \
-       src/shared/util.c \
-       src/shared/util.h \
-       src/shared/virt.c \
-       src/shared/virt.h \
+       src/shared/dns-domain.c \
+       src/shared/dns-domain.h \
         src/shared/architecture.c \
         src/shared/architecture.h \
         src/shared/efivars.c \
@@ -773,237 +922,118 @@ libsystemd_shared_la_SOURCES = \
         src/shared/formats-util.h \
         src/shared/fstab-util.c \
         src/shared/fstab-util.h \
-       src/shared/lockfile-util.c \
-       src/shared/lockfile-util.h \
-       src/shared/path-util.c \
-       src/shared/path-util.h \
-       src/shared/time-util.c \
-       src/shared/time-util.h \
-       src/shared/locale-util.c \
-       src/shared/locale-util.h \
-       src/shared/signal-util.c \
-       src/shared/signal-util.h \
-       src/shared/mempool.c \
-       src/shared/mempool.h \
-       src/shared/hashmap.c \
-       src/shared/hashmap.h \
-       src/shared/siphash24.c \
-       src/shared/siphash24.h \
-       src/shared/set.h \
-       src/shared/ordered-set.h \
-       src/shared/fdset.c \
-       src/shared/fdset.h \
-       src/shared/prioq.c \
-       src/shared/prioq.h \
         src/shared/sleep-config.c \
         src/shared/sleep-config.h \
-       src/shared/strv.c \
-       src/shared/strv.h \
-       src/shared/env-util.c \
-       src/shared/env-util.h \
-       src/shared/strbuf.c \
-       src/shared/strbuf.h \
-       src/shared/strxcpyx.c \
-       src/shared/strxcpyx.h \
         src/shared/conf-parser.c \
         src/shared/conf-parser.h \
-       src/shared/log.c \
-       src/shared/log.h \
-       src/shared/ratelimit.h \
-       src/shared/ratelimit.c \
-       src/shared/exit-status.c \
-       src/shared/exit-status.h \
-       src/shared/utf8.c \
-       src/shared/utf8.h \
-       src/shared/gunicode.c \
-       src/shared/gunicode.h \
         src/shared/pager.c \
         src/shared/pager.h \
-       src/shared/socket-util.c \
-       src/shared/socket-util.h \
-       src/shared/in-addr-util.c \
-       src/shared/in-addr-util.h \
-       src/shared/ether-addr-util.h \
-       src/shared/conf-files.c \
-       src/shared/conf-files.h \
-       src/shared/cgroup-util.c \
-       src/shared/cgroup-util.h \
-       src/shared/cgroup-show.c \
-       src/shared/cgroup-show.h \
-       src/shared/unit-name.c \
-       src/shared/unit-name.h \
-       src/shared/utmp-wtmp.h \
-       src/shared/watchdog.c \
-       src/shared/watchdog.h \
-       src/shared/spawn-ask-password-agent.c \
-       src/shared/spawn-ask-password-agent.h \
-       src/shared/replace-var.c \
-       src/shared/replace-var.h \
         src/shared/spawn-polkit-agent.c \
         src/shared/spawn-polkit-agent.h \
-       src/shared/clock-util.c \
-       src/shared/clock-util.h \
-       src/shared/calendarspec.c \
-       src/shared/calendarspec.h \
-       src/shared/fileio.c \
-       src/shared/fileio.h \
-       src/shared/output-mode.h \
-       src/shared/MurmurHash2.c \
-       src/shared/MurmurHash2.h \
-       src/shared/acpi-fpdt.h \
-       src/shared/acpi-fpdt.c \
-       src/shared/boot-timestamps.h \
-       src/shared/boot-timestamps.c \
-       src/shared/mkdir.c \
-       src/shared/mkdir.h \
-       src/shared/smack-util.c \
-       src/shared/smack-util.h \
         src/shared/apparmor-util.c \
         src/shared/apparmor-util.h \
         src/shared/ima-util.c \
         src/shared/ima-util.h \
         src/shared/ptyfwd.c \
         src/shared/ptyfwd.h \
-       src/shared/errno-list.c \
-       src/shared/errno-list.h \
-       src/shared/af-list.c \
-       src/shared/af-list.h \
-       src/shared/arphrd-list.c \
-       src/shared/arphrd-list.h \
-       src/shared/cap-list.c \
-       src/shared/cap-list.h \
-       src/shared/audit.c \
-       src/shared/audit.h \
-       src/shared/xml.c \
-       src/shared/xml.h \
-       src/shared/json.c \
-       src/shared/json.h \
-       src/shared/bus-label.c \
-       src/shared/bus-label.h \
-       src/shared/gpt.h \
-       src/shared/clean-ipc.h \
-       src/shared/clean-ipc.c \
-       src/shared/login-shared.c \
-       src/shared/login-shared.h \
-       src/shared/ring.c \
-       src/shared/ring.h \
-       src/shared/barrier.c \
-       src/shared/barrier.h \
         src/shared/pty.c \
         src/shared/pty.h \
-       src/shared/async.c \
-       src/shared/async.h \
         src/shared/base-filesystem.c \
         src/shared/base-filesystem.h \
-       src/shared/memfd-util.c \
-       src/shared/memfd-util.h \
-       src/shared/process-util.c \
-       src/shared/process-util.h \
-       src/shared/random-util.c \
-       src/shared/random-util.h \
-       src/shared/terminal-util.c \
-       src/shared/terminal-util.h \
         src/shared/uid-range.c \
         src/shared/uid-range.h \
         src/shared/nss-util.h \
-       src/shared/verbs.c \
-       src/shared/verbs.h \
-       src/shared/sigbus.c \
-       src/shared/sigbus.h \
-       src/shared/build.h \
-       src/shared/import-util.c \
-       src/shared/import-util.h \
-       src/shared/sysctl-util.c \
-       src/shared/sysctl-util.h \
-       src/shared/hostname-util.h \
-       src/shared/hostname-util.c \
-       src/shared/socket-label.c \
-       src/shared/label.c \
-       src/shared/label.h \
-       src/shared/selinux-util.c \
-       src/shared/selinux-util.h \
-       src/shared/mkdir-label.c \
-       src/shared/ask-password-api.c \
-       src/shared/ask-password-api.h \
-       src/shared/switch-root.h \
-       src/shared/switch-root.c \
-       src/shared/fileio-label.c \
-       src/shared/fileio-label.h \
+       src/shared/install.c \
+       src/shared/install.h \
+       src/shared/install-printf.c \
+       src/shared/install-printf.h \
+       src/shared/path-lookup.c \
+       src/shared/path-lookup.h \
+       src/shared/specifier.c \
+       src/shared/specifier.h \
         src/shared/dev-setup.c \
         src/shared/dev-setup.h \
         src/shared/dropin.c \
         src/shared/dropin.h \
         src/shared/condition.c \
         src/shared/condition.h \
+       src/shared/clean-ipc.c \
+       src/shared/clean-ipc.h \
         src/shared/generator.h \
         src/shared/generator.c \
-       src/shared/btrfs-util.c \
-       src/shared/btrfs-util.h \
-       src/shared/btrfs-ctree.h \
-       src/shared/rm-rf.c \
-       src/shared/rm-rf.h \
-       src/shared/copy.c \
-       src/shared/copy.h \
-       src/shared/install.c \
-       src/shared/install.h \
-       src/shared/install-printf.c \
-       src/shared/install-printf.h \
-       src/shared/path-lookup.c \
-       src/shared/path-lookup.h \
-       src/shared/specifier.c \
-       src/shared/specifier.h
+       src/shared/acpi-fpdt.h \
+       src/shared/acpi-fpdt.c \
+       src/shared/boot-timestamps.h \
+       src/shared/boot-timestamps.c \
+       src/shared/cgroup-show.c \
+       src/shared/cgroup-show.h \
+       src/shared/utmp-wtmp.h \
+       src/shared/watchdog.c \
+       src/shared/watchdog.h \
+       src/shared/spawn-ask-password-agent.c \
+       src/shared/spawn-ask-password-agent.h \
+       src/shared/ask-password-api.c \
+       src/shared/ask-password-api.h \
+       src/shared/switch-root.h \
+       src/shared/switch-root.c \
+       src/shared/import-util.c \
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h \
+       src/shared/bus-util.c \
+       src/shared/bus-util.h \
+       src/shared/logs-show.c \
+       src/shared/logs-show.h \
+       src/shared/machine-image.c \
+       src/shared/machine-image.h \
+       src/shared/machine-pool.c \
+       src/shared/machine-pool.h
  
  if HAVE_UTMP
-libsystemd_shared_la_SOURCES += \
+libshared_la_SOURCES += \
         src/shared/utmp-wtmp.c
  endif
  
-nodist_libsystemd_shared_la_SOURCES = \
-       src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h \
-       src/shared/af-from-name.h \
-       src/shared/af-to-name.h \
-       src/shared/arphrd-from-name.h \
-       src/shared/arphrd-to-name.h \
-       src/shared/cap-from-name.h \
-       src/shared/cap-to-name.h
-
-libsystemd_shared_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS) \
-       $(CAP_CFLAGS) \
-       $(SECCOMP_CFLAGS) \
-       -pthread
+if HAVE_SECCOMP
+libshared_la_SOURCES += \
+       src/shared/seccomp-util.h \
+       src/shared/seccomp-util.c
+endif
  
-libsystemd_shared_la_LIBADD = \
-       $(SELINUX_LIBS) \
-       $(CAP_LIBS) \
-       -lm
+if HAVE_ACL
+libshared_la_SOURCES += \
+       src/shared/acl-util.c \
+       src/shared/acl-util.h
+endif
  
-# -----------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-machine.la
+libshared_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ACL_CFLAGS) \
+       $(LIBIDN_CFLAGS) \
+       $(SECCOMP_CFLAGS)
  
-libsystemd_machine_la_SOURCES = \
-       src/shared/machine-image.c \
-       src/shared/machine-image.h \
-       src/shared/machine-pool.c \
-       src/shared/machine-pool.h
+libshared_la_LIBADD = \
+       libsystemd-internal.la \
+       libsystemd-journal-internal.la \
+       libudev-internal.la \
+       $(ACL_LIBS) \
+       $(LIBIDN_LIBS) \
+       $(SECCOMP_LIBS)
  
  # -----------------------------------------------------------------------------
  if HAVE_LIBIPTC
  noinst_LTLIBRARIES += \
-       libsystemd-fw.la
+       libfirewall.la
  
-libsystemd_fw_la_SOURCES = \
-       src/shared/fw-util.h \
-       src/shared/fw-util.c
+libfirewall_la_SOURCES = \
+       src/shared/firewall-util.h \
+       src/shared/firewall-util.c
  
-libsystemd_fw_la_CFLAGS = \
+libfirewall_la_CFLAGS = \
         $(AM_CFLAGS) \
         $(LIBIPTC_CFLAGS)
  
-libsystemd_fw_la_LIBADD = \
+libfirewall_la_LIBADD = \
         $(LIBIPTC_LIBS)
  endif
  
@@ -1016,54 +1046,11 @@ SYSINIT_TARGET_WANTS += \
         ldconfig.service
  endif
  
-# ------------------------------------------------------------------------------
-
-if HAVE_SECCOMP
-noinst_LTLIBRARIES += \
-       libsystemd-seccomp.la
-
-libsystemd_seccomp_la_SOURCES = \
-       src/shared/seccomp-util.h \
-       src/shared/seccomp-util.c
-
-libsystemd_seccomp_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
-
-libsystemd_seccomp_la_LIBADD = \
-       $(SECCOMP_LIBS)
-endif
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-logs.la
-
-libsystemd_logs_la_SOURCES = \
-       src/shared/logs-show.c \
-       src/shared/logs-show.h
-
-# ------------------------------------------------------------------------------
-if HAVE_ACL
-noinst_LTLIBRARIES += \
-       libsystemd-acl.la
-
-libsystemd_acl_la_SOURCES = \
-       src/shared/acl-util.c \
-       src/shared/acl-util.h
-
-libsystemd_acl_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(ACL_CFLAGS)
-
-libsystemd_acl_la_LIBADD = \
-       $(ACL_LIBS)
-endif
-
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
-       libsystemd-core.la
+       libcore.la
  
-libsystemd_core_la_SOURCES = \
+libcore_la_SOURCES = \
         src/core/unit.c \
         src/core/unit.h \
         src/core/unit-printf.c \
@@ -1185,36 +1172,27 @@ libsystemd_core_la_SOURCES = \
         src/core/failure-action.c \
         src/core/failure-action.h
  
-nodist_libsystemd_core_la_SOURCES = \
+nodist_libcore_la_SOURCES = \
         src/core/load-fragment-gperf.c \
         src/core/load-fragment-gperf-nulstr.c
  
-libsystemd_core_la_CFLAGS = \
+libcore_la_CFLAGS = \
         $(AM_CFLAGS) \
         $(PAM_CFLAGS) \
         $(AUDIT_CFLAGS) \
         $(KMOD_CFLAGS) \
         $(APPARMOR_CFLAGS) \
-       $(SECCOMP_CFLAGS) \
         $(MOUNT_CFLAGS) \
-       -pthread
+       $(SECCOMP_CFLAGS)
  
-libsystemd_core_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la \
+libcore_la_LIBADD = \
+       libshared.la \
         $(PAM_LIBS) \
         $(AUDIT_LIBS) \
         $(KMOD_LIBS) \
         $(APPARMOR_LIBS) \
-       $(SECCOMP_LIBS) \
         $(MOUNT_LIBS)
  
-if HAVE_SECCOMP
-libsystemd_core_la_LIBADD += \
-       libsystemd-seccomp.la
-endif
-
  src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
         $(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 ";" }' < $< > $@
@@ -1223,10 +1201,10 @@ gperf_gperf_m4_sources = \
         src/core/load-fragment-gperf.gperf.m4
  
  gperf_txt_sources = \
-       src/shared/errno-list.txt \
-       src/shared/af-list.txt \
-       src/shared/arphrd-list.txt \
-       src/shared/cap-list.txt
+       src/basic/errno-list.txt \
+       src/basic/af-list.txt \
+       src/basic/arphrd-list.txt \
+       src/basic/cap-list.txt
  
  BUILT_SOURCES += \
         $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
@@ -1256,61 +1234,61 @@ CLEANFILES += \
         $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
  
  
-src/shared/errno-list.txt:
+src/basic/errno-list.txt:
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
  
-src/shared/errno-to-name.h: src/shared/errno-list.txt
+src/basic/errno-to-name.h: src/basic/errno-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
  
  
-src/shared/af-list.txt:
+src/basic/af-list.txt:
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
  
-src/shared/af-to-name.h: src/shared/af-list.txt
+src/basic/af-to-name.h: src/basic/af-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
  
  
-src/shared/arphrd-list.txt:
+src/basic/arphrd-list.txt:
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
  
-src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt
+src/basic/arphrd-to-name.h: src/basic/arphrd-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
  
-src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
+src/basic/arphrd-from-name.gperf: src/basic/arphrd-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
  
  
-src/shared/cap-list.txt:
+src/basic/cap-list.txt:
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
  
-src/shared/cap-to-name.h: src/shared/cap-list.txt
+src/basic/cap-to-name.h: src/basic/cap-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
  
-src/shared/cap-from-name.gperf: src/shared/cap-list.txt
+src/basic/cap-from-name.gperf: src/basic/cap-list.txt
         $(AM_V_at)$(MKDIR_P) $(dir $@)
         $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
  
-src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
+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 $@)
@@ -1338,8 +1316,7 @@ systemd_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  systemd_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  dist_pkgsysconf_DATA += \
         src/core/system.conf \
@@ -1380,12 +1357,12 @@ manual_tests += \
  
  if HAVE_LIBIPTC
  manual_tests += \
-       test-fw-util
+       test-firewall-util
  endif
  
  if HAVE_KMOD
  manual_tests += \
-       test-rtnl-manual
+       test-netlink-manual
  endif
  
  tests += \
@@ -1446,7 +1423,8 @@ tests += \
         test-copy \
         test-cap-list \
         test-sigbus \
-       test-verbs
+       test-verbs \
+       test-dns-domain
  
  EXTRA_DIST += \
         test/a.service \
@@ -1531,7 +1509,7 @@ test_device_nodes_SOURCES = \
         src/test/test-device-nodes.c
  
  test_device_nodes_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_engine_SOURCES = \
         src/test/test-engine.c
@@ -1541,8 +1519,7 @@ test_engine_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_engine_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_job_type_SOURCES = \
         src/test/test-job-type.c
@@ -1552,8 +1529,7 @@ test_job_type_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_job_type_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_ns_SOURCES = \
         src/test/test-ns.c
@@ -1563,19 +1539,26 @@ test_ns_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_ns_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_loopback_SOURCES = \
         src/test/test-loopback.c
  
  test_loopback_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_hostname_SOURCES = \
         src/test/test-hostname.c
  
  test_hostname_LDADD = \
-       libsystemd-core.la
+       libcore.la
+
+test_dns_domain_SOURCES = \
+       src/test/test-dns-domain.c
+
+test_dns_domain_LDADD = \
+       libsystemd-network.la \
+       libshared.la
  
  if ENABLE_EFI
  manual_tests += \
@@ -1585,7 +1568,7 @@ test_boot_timestamp_SOURCES = \
         src/test/test-boot-timestamps.c
  
  test_boot_timestamp_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  endif
  
  test_unit_name_SOURCES = \
@@ -1596,8 +1579,7 @@ test_unit_name_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_unit_name_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_unit_file_SOURCES = \
         src/test/test-unit-file.c
@@ -1607,137 +1589,133 @@ test_unit_file_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_unit_file_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_utf8_SOURCES = \
         src/test/test-utf8.c
  
  test_utf8_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_capability_SOURCES = \
         src/test/test-capability.c
  
  test_capability_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_async_SOURCES = \
         src/test/test-async.c
  
  test_async_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_locale_util_SOURCES = \
         src/test/test-locale-util.c
  
  test_locale_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_copy_SOURCES = \
         src/test/test-copy.c
  
  test_copy_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_sigbus_SOURCES = \
         src/test/test-sigbus.c
  
  test_sigbus_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_condition_SOURCES = \
         src/test/test-condition.c
  
  test_condition_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_fdset_SOURCES = \
         src/test/test-fdset.c
  
  test_fdset_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_fstab_util_SOURCES = \
         src/test/test-fstab-util.c
  
  test_fstab_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_ratelimit_SOURCES = \
         src/test/test-ratelimit.c
  
  test_ratelimit_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_util_SOURCES = \
         src/test/test-util.c
  
  test_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_process_util_SOURCES = \
         src/test/test-process-util.c
  
  test_process_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_terminal_util_SOURCES = \
         src/test/test-terminal-util.c
  
  test_terminal_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_path_lookup_SOURCES = \
         src/test/test-path-lookup.c
  
  test_path_lookup_LDADD = \
-       -lm \
-       libsystemd-shared.la
+       libshared.la
  
  test_uid_range_SOURCES = \
         src/test/test-uid-range.c
  
  test_uid_range_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_cap_list_SOURCES = \
         src/test/test-cap-list.c
  
  test_cap_list_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_socket_util_SOURCES = \
         src/test/test-socket-util.c
  
  test_socket_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_ring_SOURCES = \
         src/test/test-ring.c
  
  test_ring_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_barrier_SOURCES = \
         src/test/test-barrier.c
  
  test_barrier_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_pty_SOURCES = \
         src/test/test-pty.c
  
  test_pty_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_tmpfiles_SOURCES = \
         src/test/test-tmpfiles.c
  
  test_tmpfiles_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_namespace_SOURCES = \
         src/test/test-namespace.c
@@ -1746,10 +1724,10 @@ test_verbs_SOURCES = \
         src/test/test-verbs.c
  
  test_verbs_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_namespace_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  BUILT_SOURCES += \
         src/test/test-hashmap-ordered.c
@@ -1771,34 +1749,34 @@ test_hashmap_SOURCES = \
         src/test/test-hashmap-plain.c
  
  test_hashmap_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_set_SOURCES = \
         src/test/test-set.c
  
  test_set_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_xml_SOURCES = \
         src/test/test-xml.c
  
  test_xml_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_json_SOURCES = \
         src/test/test-json.c
  
  test_json_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_list_SOURCES = \
         src/test/test-list.c
  
  test_list_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_unaligned_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_unaligned_SOURCES = \
         src/test/test-unaligned.c
@@ -1820,131 +1798,124 @@ test_tables_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_tables_LDADD = \
-       libsystemd-logs.la \
-       libsystemd-journal-internal.la \
-       libsystemd-journal-core.la \
-       libsystemd-core.la \
-       libudev-core.la \
-       $(RT_LIBS)
+       libjournal-core.la \
+       libcore.la \
+       libudev-core.la
  
  test_prioq_SOURCES = \
         src/test/test-prioq.c
  
  test_prioq_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_fileio_SOURCES = \
         src/test/test-fileio.c
  
  test_fileio_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_time_SOURCES = \
         src/test/test-time.c
  
  test_time_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_architecture_SOURCES = \
         src/test/test-architecture.c
  
  test_architecture_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_log_SOURCES = \
         src/test/test-log.c
  
  test_log_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_ipcrm_SOURCES = \
         src/test/test-ipcrm.c
  
  test_ipcrm_LDADD = \
-       libsystemd-shared.la \
-       -lrt
+       libshared.la
  
  test_btrfs_SOURCES = \
         src/test/test-btrfs.c
  
  test_btrfs_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  if HAVE_LIBIPTC
-test_fw_util_SOURCES = \
-       src/test/test-fw-util.c
+test_firewall_util_SOURCES = \
+       src/test/test-firewall-util.c
  
-test_fw_util_CFLAGS = \
+test_firewall_util_CFLAGS = \
         $(AM_CFLAGS) \
         $(LIBIPTC_CFLAGS)
  
-test_fw_util_LDADD = \
-       libsystemd-fw.la \
-       libsystemd-shared.la \
+test_firewall_util_LDADD = \
+       libfirewall.la \
+       libshared.la \
         $(LIBIPTC_LIBS)
  endif
  
-test_rtnl_manual_SOURCES = \
-       src/test/test-rtnl-manual.c
+test_netlink_manual_SOURCES = \
+       src/test/test-netlink-manual.c
  
-test_rtnl_manual_CFLAGS = \
+test_netlink_manual_CFLAGS = \
         $(AM_CFLAGS) \
         $(KMOD_CFLAGS)
  
-test_rtnl_manual_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+test_netlink_manual_LDADD = \
+       libshared.la \
         $(KMOD_LIBS)
  
  test_ellipsize_SOURCES = \
         src/test/test-ellipsize.c
  
  test_ellipsize_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_date_SOURCES = \
         src/test/test-date.c
  
  test_date_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_sleep_SOURCES = \
         src/test/test-sleep.c
  
  test_sleep_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_replace_var_SOURCES = \
         src/test/test-replace-var.c
  
  test_replace_var_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_calendarspec_SOURCES = \
         src/test/test-calendarspec.c
  
  test_calendarspec_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_strip_tab_ansi_SOURCES = \
         src/test/test-strip-tab-ansi.c
  
  test_strip_tab_ansi_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_daemon_SOURCES = \
         src/test/test-daemon.c
  
  test_daemon_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_cgroup_SOURCES = \
         src/test/test-cgroup.c
  
  test_cgroup_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_cgroup_mask_SOURCES = \
         src/test/test-cgroup-mask.c
@@ -1957,40 +1928,37 @@ test_cgroup_mask_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_cgroup_mask_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_cgroup_util_SOURCES = \
         src/test/test-cgroup-util.c
  
  test_cgroup_util_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_env_replace_SOURCES = \
         src/test/test-env-replace.c
  
  test_env_replace_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_strbuf_SOURCES = \
         src/test/test-strbuf.c
  
  test_strbuf_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_strv_SOURCES = \
         src/test/test-strv.c
  
  test_strv_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_path_util_SOURCES = \
         src/test/test-path-util.c
  
  test_path_util_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_path_SOURCES = \
         src/test/test-path.c
@@ -1999,7 +1967,7 @@ test_path_CFLAGS = \
         $(AM_CFLAGS)
  
  test_path_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_execute_SOURCES = \
         src/test/test-execute.c
@@ -2008,26 +1976,25 @@ test_execute_CFLAGS = \
         $(AM_CFLAGS)
  
  test_execute_LDADD = \
-       libsystemd-core.la
+       libcore.la
  
  test_strxcpyx_SOURCES = \
         src/test/test-strxcpyx.c
  
  test_strxcpyx_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_install_SOURCES = \
         src/test/test-install.c
  
  test_install_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  test_watchdog_SOURCES = \
         src/test/test-watchdog.c
  
  test_watchdog_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_sched_prio_SOURCES = \
         src/test/test-sched-prio.c
@@ -2040,28 +2007,26 @@ test_sched_prio_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_sched_prio_LDADD = \
-       libsystemd-core.la \
-       $(RT_LIBS)
+       libcore.la
  
  test_conf_files_SOURCES = \
         src/test/test-conf-files.c
  
  test_conf_files_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_conf_parser_SOURCES = \
         src/test/test-conf-parser.c
  
  test_conf_parser_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_policy_SOURCES = \
         src/bus-proxyd/test-bus-xml-policy.c
  
  test_bus_policy_LDADD = \
-       libsystemd-proxy.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libbus-proxy-core.la \
+       libshared.la
  
  # ------------------------------------------------------------------------------
  ## .PHONY so it always rebuilds it
@@ -2113,18 +2078,14 @@ systemd_analyze_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  systemd_analyze_LDADD = \
-       libsystemd-core.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la \
-       $(RT_LIBS)
+       libcore.la
  
  # ------------------------------------------------------------------------------
  systemd_initctl_SOURCES = \
         src/initctl/initctl.c
  
  systemd_initctl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_update_utmp_SOURCES = \
@@ -2135,8 +2096,7 @@ systemd_update_utmp_CFLAGS = \
         $(AUDIT_CFLAGS)
  
  systemd_update_utmp_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(AUDIT_LIBS)
  
  # ------------------------------------------------------------------------------
@@ -2144,8 +2104,7 @@ systemd_update_done_SOURCES = \
         src/update-done/update-done.c
  
  systemd_update_done_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_shutdown_SOURCES = \
@@ -2158,9 +2117,7 @@ systemd_shutdown_SOURCES = \
         src/core/killall.c
  
  systemd_shutdown_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  if HAVE_KMOD
@@ -2172,7 +2129,7 @@ systemd_modules_load_CFLAGS = \
         $(KMOD_CFLAGS)
  
  systemd_modules_load_LDADD = \
-       libsystemd-shared.la \
+       libshared.la \
         $(KMOD_LIBS)
  
  rootlibexec_PROGRAMS += \
@@ -2203,13 +2160,7 @@ systemd_tmpfiles_SOURCES = \
         src/tmpfiles/tmpfiles.c
  
  systemd_tmpfiles_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
-
-if HAVE_ACL
-systemd_tmpfiles_LDADD += \
-       libsystemd-acl.la
-endif
+       libshared.la
  
  rootbin_PROGRAMS += \
         systemd-tmpfiles
@@ -2231,7 +2182,8 @@ 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
  
  if HAVE_SYSV_COMPAT
  dist_tmpfiles_DATA += \
@@ -2266,8 +2218,7 @@ systemd_sysusers_SOURCES = \
         src/sysusers/sysusers.c
  
  systemd_sysusers_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         systemd-sysusers
@@ -2307,8 +2258,7 @@ systemd_firstboot_SOURCES = \
         src/firstboot/firstboot.c
  
  systemd_firstboot_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la \
+       libshared.la \
         -lcrypt
  
  rootbin_PROGRAMS += \
@@ -2331,31 +2281,28 @@ systemd_machine_id_setup_SOURCES = \
         src/core/machine-id-setup.h
  
  systemd_machine_id_setup_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_sysctl_SOURCES = \
         src/sysctl/sysctl.c
  
  systemd_sysctl_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_sleep_SOURCES = \
         src/sleep/sleep.c
  
  systemd_sleep_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_fsck_SOURCES = \
         src/fsck/fsck.c
  
  systemd_fsck_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_machine_id_commit_SOURCES = \
@@ -2364,8 +2311,7 @@ systemd_machine_id_commit_SOURCES = \
         src/core/machine-id-setup.h
  
  systemd_machine_id_commit_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  SYSINIT_TARGET_WANTS += \
         systemd-machine-id-commit.service
@@ -2375,16 +2321,14 @@ systemd_ac_power_SOURCES = \
         src/ac-power/ac-power.c
  
  systemd_ac_power_LDADD = \
-       libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_detect_virt_SOURCES = \
         src/detect-virt/detect-virt.c
  
  systemd_detect_virt_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  INSTALL_EXEC_HOOKS += \
         systemd-detect-virt-install-hook
@@ -2394,21 +2338,21 @@ systemd_delta_SOURCES = \
         src/delta/delta.c
  
  systemd_delta_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_getty_generator_SOURCES = \
         src/getty-generator/getty-generator.c
  
  systemd_getty_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_debug_generator_SOURCES = \
         src/debug-generator/debug-generator.c
  
  systemd_debug_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_fstab_generator_SOURCES = \
@@ -2416,14 +2360,14 @@ systemd_fstab_generator_SOURCES = \
         src/core/mount-setup.c
  
  systemd_fstab_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_system_update_generator_SOURCES = \
         src/system-update-generator/system-update-generator.c
  
  systemd_system_update_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  if ENABLE_HIBERNATE
@@ -2437,14 +2381,13 @@ systemd_hibernate_resume_SOURCES = \
         src/hibernate-resume/hibernate-resume.c
  
  systemd_hibernate_resume_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  systemd_hibernate_resume_generator_SOURCES = \
         src/hibernate-resume/hibernate-resume-generator.c
  
  systemd_hibernate_resume_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  dist_systemunit_DATA += \
         units/hibernate.target \
@@ -2470,7 +2413,7 @@ systemd_efi_boot_generator_SOURCES = \
         src/efi-boot-generator/efi-boot-generator.c
  
  systemd_efi_boot_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  if HAVE_BLKID
@@ -2487,8 +2430,7 @@ bootctl_CFLAGS = \
         $(BLKID_CFLAGS)
  
  bootctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la \
+       libshared.la \
         $(BLKID_LIBS)
  
  bin_PROGRAMS += \
@@ -2662,12 +2604,10 @@ systemgenerator_PROGRAMS +=  \
  
  systemd_gpt_auto_generator_SOURCES = \
         src/gpt-auto-generator/gpt-auto-generator.c \
-       src/shared/blkid-util.h
+       src/basic/blkid-util.h
  
  systemd_gpt_auto_generator_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(BLKID_LIBS)
  
  systemd_gpt_auto_generator_CFLAGS = \
@@ -2676,7 +2616,6 @@ systemd_gpt_auto_generator_CFLAGS = \
  endif
  
  # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
  systemgenerator_PROGRAMS +=  \
         systemd-dbus1-generator
  
@@ -2684,8 +2623,7 @@ systemd_dbus1_generator_SOURCES = \
         src/dbus1-generator/dbus1-generator.c
  
  systemd_dbus1_generator_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  dbus1-generator-install-hook:
         $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
@@ -2700,22 +2638,20 @@ dist_xinitrc_SCRIPTS = \
  
  INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
  UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-endif
  
  # ------------------------------------------------------------------------------
  systemd_sysv_generator_SOURCES = \
         src/sysv-generator/sysv-generator.c
  
  systemd_sysv_generator_LDADD = \
-       libsystemd-core.la \
-       libsystemd-shared.la
+       libcore.la
  
  # ------------------------------------------------------------------------------
  systemd_rc_local_generator_SOURCES = \
         src/rc-local-generator/rc-local-generator.c
  
  systemd_rc_local_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_remount_fs_SOURCES = \
@@ -2724,77 +2660,70 @@ systemd_remount_fs_SOURCES = \
         src/core/mount-setup.h
  
  systemd_remount_fs_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_cgroups_agent_SOURCES = \
         src/cgroups-agent/cgroups-agent.c
  
  systemd_cgroups_agent_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_escape_SOURCES = \
         src/escape/escape.c
  
  systemd_escape_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # -----------------------------------------------------------------------------
  systemctl_SOURCES = \
         src/systemctl/systemctl.c
  
  systemctl_LDADD = \
-       libsystemd-logs.la \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_notify_SOURCES = \
         src/notify/notify.c
  
  systemd_notify_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_path_SOURCES = \
         src/path/path.c
  
  systemd_path_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_ask_password_SOURCES = \
         src/ask-password/ask-password.c
  
  systemd_ask_password_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_reply_password_SOURCES = \
         src/reply-password/reply-password.c
  
  systemd_reply_password_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_cgls_SOURCES = \
         src/cgls/cgls.c
  
  systemd_cgls_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_cgtop_SOURCES = \
         src/cgtop/cgtop.c
  
  systemd_cgtop_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_nspawn_SOURCES = \
@@ -2806,25 +2735,16 @@ systemd_nspawn_SOURCES = \
  
  systemd_nspawn_CFLAGS = \
         $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS) \
-       $(BLKID_CFLAGS)
+       $(BLKID_CFLAGS) \
+       $(SECCOMP_CFLAGS)
  
  systemd_nspawn_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-machine.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(BLKID_LIBS)
  
-if HAVE_SECCOMP
-systemd_nspawn_LDADD += \
-       libsystemd-seccomp.la \
-       $(SECCOMP_LIBS)
-endif
-
  if HAVE_LIBIPTC
  systemd_nspawn_LDADD += \
-       libsystemd-fw.la
+       libfirewall.la
  endif
  
  # ------------------------------------------------------------------------------
@@ -2832,14 +2752,13 @@ systemd_run_SOURCES = \
         src/run/run.c
  
  systemd_run_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
-       libsystemd-proxy.la
+       libbus-proxy-core.la
  
-libsystemd_proxy_la_SOURCES = \
+libbus_proxy_core_la_SOURCES = \
         src/bus-proxyd/bus-xml-policy.c \
         src/bus-proxyd/bus-xml-policy.h \
         src/bus-proxyd/driver.c \
@@ -2849,35 +2768,23 @@ libsystemd_proxy_la_SOURCES = \
         src/bus-proxyd/synthesize.c \
         src/bus-proxyd/synthesize.h
  
-libsystemd_proxy_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
-libsystemd_proxy_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+libbus_proxy_core_la_LIBADD = \
+       libshared.la
  
  systemd_bus_proxyd_SOURCES = \
         src/bus-proxyd/bus-proxyd.c
  
-systemd_bus_proxyd_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
  systemd_bus_proxyd_LDADD = \
-       libsystemd-proxy.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libbus-proxy-core.la \
+       libshared.la
  
  systemd_stdio_bridge_SOURCES = \
         src/bus-proxyd/stdio-bridge.c
  
  systemd_stdio_bridge_LDADD = \
-       libsystemd-proxy.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libbus-proxy-core.la \
+       libshared.la
  
-if ENABLE_KDBUS
  nodist_systemunit_DATA += \
         units/systemd-bus-proxyd.service
  
@@ -2889,7 +2796,6 @@ nodist_userunit_DATA += \
  
  dist_userunit_DATA += \
         units/user/systemd-bus-proxyd.socket
-endif
  
  EXTRA_DIST += \
         units/systemd-bus-proxyd.service.m4.in \
@@ -2907,7 +2813,7 @@ systemd_tty_ask_password_agent_SOURCES = \
         src/tty-ask-password-agent/tty-ask-password-agent.c
  
  systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  libsystemd_internal_la_SOURCES = \
@@ -2916,7 +2822,7 @@ libsystemd_internal_la_SOURCES = \
         src/systemd/sd-bus-vtable.h \
         src/systemd/sd-utf8.h \
         src/systemd/sd-event.h \
-       src/systemd/sd-rtnl.h \
+       src/systemd/sd-netlink.h \
         src/systemd/sd-resolve.h \
         src/systemd/sd-login.h \
         src/systemd/sd-id128.h \
@@ -2925,6 +2831,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 \
@@ -2961,24 +2868,26 @@ libsystemd_internal_la_SOURCES = \
         src/libsystemd/sd-bus/bus-convenience.c \
         src/libsystemd/sd-bus/bus-track.c \
         src/libsystemd/sd-bus/bus-track.h \
-       src/libsystemd/sd-bus/bus-util.c \
-       src/libsystemd/sd-bus/bus-util.h \
         src/libsystemd/sd-bus/bus-slot.c \
         src/libsystemd/sd-bus/bus-slot.h \
         src/libsystemd/sd-bus/bus-protocol.h \
         src/libsystemd/sd-bus/kdbus.h \
+       src/libsystemd/sd-bus/bus-dump.c \
+       src/libsystemd/sd-bus/bus-dump.h \
         src/libsystemd/sd-utf8/sd-utf8.c \
         src/libsystemd/sd-event/sd-event.c \
         src/libsystemd/sd-event/event-util.h \
-       src/libsystemd/sd-rtnl/sd-rtnl.c \
-       src/libsystemd/sd-rtnl/rtnl-internal.h \
-       src/libsystemd/sd-rtnl/rtnl-message.c \
-       src/libsystemd/sd-rtnl/rtnl-types.h \
-       src/libsystemd/sd-rtnl/rtnl-types.c \
-       src/libsystemd/sd-rtnl/rtnl-util.h \
-       src/libsystemd/sd-rtnl/rtnl-util.c \
-       src/libsystemd/sd-rtnl/local-addresses.h \
-       src/libsystemd/sd-rtnl/local-addresses.c \
+       src/libsystemd/sd-netlink/sd-netlink.c \
+       src/libsystemd/sd-netlink/netlink-internal.h \
+       src/libsystemd/sd-netlink/netlink-message.c \
+       src/libsystemd/sd-netlink/netlink-socket.c \
+       src/libsystemd/sd-netlink/rtnl-message.c \
+       src/libsystemd/sd-netlink/netlink-types.h \
+       src/libsystemd/sd-netlink/netlink-types.c \
+       src/libsystemd/sd-netlink/netlink-util.h \
+       src/libsystemd/sd-netlink/netlink-util.c \
+       src/libsystemd/sd-netlink/local-addresses.h \
+       src/libsystemd/sd-netlink/local-addresses.c \
         src/libsystemd/sd-id128/sd-id128.c \
         src/libsystemd/sd-daemon/sd-daemon.c \
         src/libsystemd/sd-login/sd-login.c \
@@ -2995,52 +2904,24 @@ libsystemd_internal_la_SOURCES = \
         src/libsystemd/sd-device/device-enumerator-private.h \
         src/libsystemd/sd-device/sd-device.c \
         src/libsystemd/sd-device/device-private.c \
-       src/libsystemd/sd-device/device-private.h
-
-nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym
-
-libsystemd_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
-libsystemd_internal_la_LIBADD = \
-       $(RT_LIBS)
-
-libsystemd_resolve_la_SOURCES = \
+       src/libsystemd/sd-device/device-private.h \
         src/libsystemd/sd-resolve/sd-resolve.c \
         src/libsystemd/sd-resolve/resolve-util.h
  
-libsystemd_resolve_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
-libsystemd_resolve_la_LIBADD = \
+libsystemd_internal_la_LIBADD = \
+       libbasic.la \
         -lresolv
  
  noinst_LTLIBRARIES += \
-       libsystemd-internal.la \
-       libsystemd-resolve.la
-
-libsystemd_dump_la_SOURCES = \
-       src/libsystemd/sd-bus/bus-dump.c \
-       src/libsystemd/sd-bus/bus-dump.h
-
-noinst_LTLIBRARIES += \
-       libsystemd-dump.la
+       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_resolve_la_SOURCES) \
         $(libsystemd_journal_internal_la_SOURCES)
  
  nodist_libsystemd_la_SOURCES = \
@@ -3048,19 +2929,16 @@ nodist_libsystemd_la_SOURCES = \
  
  libsystemd_la_CFLAGS = \
         $(libsystemd_internal_la_CFLAGS) \
-       $(libsystemd_resolve_la_CFLAGS) \
         $(libsystemd_journal_internal_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-shared.la \
         $(libsystemd_internal_la_LIBADD) \
-       $(libsystemd_journal_internal_la_LIBADD) \
-       $(libsystemd_resolve_la_LIBADD)
+       $(libsystemd_journal_internal_la_LIBADD)
  
  libsystemd-install-hook:
         libname=libsystemd.so && $(move-to-rootlibdir)
@@ -3083,14 +2961,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-rtnl.h \
-       src/systemd/sd-resolve.h \
-       src/systemd/sd-path.h
-endif
-
  lib_LTLIBRARIES += \
         libsystemd.la
  
@@ -3111,7 +2981,7 @@ tests += \
         test-bus-creds \
         test-bus-gvariant \
         test-event \
-       test-rtnl \
+       test-netlink \
         test-local-addresses \
         test-resolve
  
@@ -3122,9 +2992,7 @@ test_bus_marshal_SOURCES = \
         src/libsystemd/sd-bus/test-bus-marshal.c
  
  test_bus_marshal_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(GLIB_LIBS) \
         $(DBUS_LIBS)
  
@@ -3137,19 +3005,13 @@ test_bus_signature_SOURCES = \
         src/libsystemd/sd-bus/test-bus-signature.c
  
  test_bus_signature_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_chat_SOURCES = \
         src/libsystemd/sd-bus/test-bus-chat.c
  
-test_bus_chat_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
  test_bus_chat_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_cleanup_SOURCES = \
         src/libsystemd/sd-bus/test-bus-cleanup.c
@@ -3159,46 +3021,31 @@ test_bus_cleanup_CFLAGS = \
         $(SECCOMP_CFLAGS)
  
  test_bus_cleanup_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_server_SOURCES = \
         src/libsystemd/sd-bus/test-bus-server.c
  
-test_bus_server_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
  test_bus_server_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_objects_SOURCES = \
         src/libsystemd/sd-bus/test-bus-objects.c
  
-test_bus_objects_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
  test_bus_objects_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_error_SOURCES = \
         src/libsystemd/sd-bus/test-bus-error.c
  
  test_bus_error_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_gvariant_SOURCES = \
         src/libsystemd/sd-bus/test-bus-gvariant.c
  
  test_bus_gvariant_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(GLIB_LIBS)
  
  test_bus_gvariant_CFLAGS = \
@@ -3209,86 +3056,67 @@ test_bus_creds_SOURCES = \
         src/libsystemd/sd-bus/test-bus-creds.c
  
  test_bus_creds_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_match_SOURCES = \
         src/libsystemd/sd-bus/test-bus-match.c
  
  test_bus_match_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_kernel_SOURCES = \
         src/libsystemd/sd-bus/test-bus-kernel.c
  
  test_bus_kernel_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_kernel_bloom_SOURCES = \
         src/libsystemd/sd-bus/test-bus-kernel-bloom.c
  
  test_bus_kernel_bloom_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_benchmark_SOURCES = \
         src/libsystemd/sd-bus/test-bus-benchmark.c
  
  test_bus_benchmark_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_zero_copy_SOURCES = \
         src/libsystemd/sd-bus/test-bus-zero-copy.c
  
  test_bus_zero_copy_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_bus_introspect_SOURCES = \
         src/libsystemd/sd-bus/test-bus-introspect.c
  
  test_bus_introspect_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_event_SOURCES = \
         src/libsystemd/sd-event/test-event.c
  
  test_event_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
-test_rtnl_SOURCES = \
-       src/libsystemd/sd-rtnl/test-rtnl.c
+test_netlink_SOURCES = \
+       src/libsystemd/sd-netlink/test-netlink.c
  
-test_rtnl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+test_netlink_LDADD = \
+       libshared.la
  
  test_local_addresses_SOURCES = \
-       src/libsystemd/sd-rtnl/test-local-addresses.c
+       src/libsystemd/sd-netlink/test-local-addresses.c
  
  test_local_addresses_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_resolve_SOURCES = \
         src/libsystemd/sd-resolve/test-resolve.c
  
  test_resolve_LDADD = \
-       libsystemd-resolve.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
-test_resolve_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
+       libshared.la
  
  busctl_SOURCES = \
         src/libsystemd/sd-bus/busctl.c \
@@ -3296,9 +3124,7 @@ busctl_SOURCES = \
         src/libsystemd/sd-bus/busctl-introspect.h
  
  busctl_LDADD = \
-       libsystemd-dump.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  noinst_LTLIBRARIES += \
@@ -3358,9 +3184,6 @@ libsystemd_network_la_SOURCES = \
         src/libsystemd-network/sd-lldp.c
  
  libsystemd_network_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
         $(KMOD_LIBS)
  
  test_dhcp_option_SOURCES = \
@@ -3370,8 +3193,7 @@ test_dhcp_option_SOURCES = \
  
  test_dhcp_option_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_dhcp_client_SOURCES = \
         src/systemd/sd-dhcp-client.h \
@@ -3381,16 +3203,14 @@ test_dhcp_client_SOURCES = \
  
  test_dhcp_client_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_dhcp_server_SOURCES = \
         src/libsystemd-network/test-dhcp-server.c
  
  test_dhcp_server_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_ipv4ll_SOURCES = \
         src/systemd/sd-ipv4ll.h \
@@ -3399,8 +3219,7 @@ test_ipv4ll_SOURCES = \
  
  test_ipv4ll_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_pppoe_SOURCES = \
         src/systemd/sd-pppoe.h \
@@ -3408,7 +3227,7 @@ test_pppoe_SOURCES = \
  
  test_pppoe_LDADD = \
         libsystemd-network.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_icmp6_rs_SOURCES = \
         src/systemd/sd-dhcp6-client.h \
@@ -3420,8 +3239,8 @@ test_icmp6_rs_SOURCES = \
  
  test_icmp6_rs_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libudev.la \
+       libshared.la
  
  test_dhcp6_client_SOURCES = \
         src/systemd/sd-dhcp6-client.h \
@@ -3432,19 +3251,18 @@ test_dhcp6_client_SOURCES = \
  
  test_dhcp6_client_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libudev.la \
+       libshared.la
  
  test_lldp_SOURCES = \
-       src/libsystemd-network/lldp.h \
-       src/libsystemd-network/lldp-tlv.h \
-       src/libsystemd-network/lldp-tlv.c \
-       src/libsystemd-network/test-lldp.c
+       src/libsystemd-network/lldp.h \
+       src/libsystemd-network/lldp-tlv.h \
+       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/test-lldp.c
  
  test_lldp_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  tests += \
         test-dhcp-option \
@@ -3518,9 +3336,7 @@ libsystemd_terminal_la_SOURCES = \
         src/libsystemd-terminal/unifont.c
  
  libsystemd_terminal_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(TERMINAL_LIBS)
  
  systemd_consoled_CFLAGS = \
@@ -3538,8 +3354,7 @@ systemd_consoled_SOURCES = \
  
  systemd_consoled_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(TERMINAL_LIBS)
  
  systemd_evcat_CFLAGS = \
@@ -3551,8 +3366,7 @@ systemd_evcat_SOURCES = \
  
  systemd_evcat_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(TERMINAL_LIBS)
  
  systemd_modeset_CFLAGS = \
@@ -3564,8 +3378,7 @@ systemd_modeset_SOURCES = \
  
  systemd_modeset_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(TERMINAL_LIBS)
  
  systemd_subterm_SOURCES = \
@@ -3573,36 +3386,35 @@ systemd_subterm_SOURCES = \
  
  systemd_subterm_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_term_page_SOURCES = \
         src/libsystemd-terminal/test-term-page.c
  
  test_term_page_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_term_parser_SOURCES = \
         src/libsystemd-terminal/test-term-parser.c
  
  test_term_parser_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_unifont_SOURCES = \
         src/libsystemd-terminal/test-unifont.c
  
  test_unifont_LDADD = \
         libsystemd-terminal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
         $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
  
+EXTRA_DIST += \
+       tools/compile-unifont.py
+
  # ------------------------------------------------------------------------------
  include_HEADERS += \
         src/libudev/libudev.h
@@ -3624,18 +3436,13 @@ 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) \
         -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
  
  libudev_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-internal.la
  
  pkgconfiglib_DATA += \
         src/libudev/libudev.pc
@@ -3660,10 +3467,6 @@ noinst_LTLIBRARIES += \
  libudev_internal_la_SOURCES =\
         $(libudev_la_SOURCES)
  
-libudev_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default
-
  # ------------------------------------------------------------------------------
  INSTALL_DIRS += \
         $(sysconfdir)/udev/rules.d
@@ -3778,10 +3581,8 @@ libudev_core_la_CFLAGS = \
         $(KMOD_CFLAGS)
  
  libudev_core_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
         libsystemd-network.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(BLKID_LIBS) \
         $(KMOD_LIBS)
  
@@ -3804,9 +3605,6 @@ libudev_core_la_SOURCES += \
         src/login/logind-acl.c \
         src/libsystemd/sd-login/sd-login.c \
         src/systemd/sd-login.h
-
-libudev_core_la_LIBADD += \
-       libsystemd-acl.la
  endif
  
  systemd_udevd_SOURCES = \
@@ -3841,9 +3639,7 @@ systemd_hwdb_SOURCES = \
         src/hwdb/hwdb.c
  
  systemd_hwdb_LDADD = \
-       libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         systemd-hwdb
@@ -3910,9 +3706,7 @@ test_libudev_SOURCES = \
         src/test/test-libudev.c
  
  test_libudev_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_udev_SOURCES = \
         src/test/test-udev.c
@@ -3920,13 +3714,7 @@ test_udev_SOURCES = \
  test_udev_LDADD = \
         libudev-core.la  \
         $(BLKID_LIBS) \
-       $(KMOD_LIBS) \
-       $(SELINUX_LIBS)
-
-if HAVE_ACL
-test_udev_LDADD += \
-       libsystemd-acl.la
-endif
+       $(KMOD_LIBS)
  
  check_DATA += \
         test/sys
@@ -3954,9 +3742,7 @@ ata_id_SOURCES = \
         src/udev/ata_id/ata_id.c
  
  ata_id_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         ata_id
@@ -3966,9 +3752,7 @@ cdrom_id_SOURCES = \
         src/udev/cdrom_id/cdrom_id.c
  
  cdrom_id_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         cdrom_id
@@ -3981,9 +3765,7 @@ collect_SOURCES = \
         src/udev/collect/collect.c
  
  collect_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         collect
@@ -3996,9 +3778,7 @@ scsi_id_SOURCES =\
         src/udev/scsi_id/scsi_id.h
  
  scsi_id_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         scsi_id
@@ -4011,9 +3791,7 @@ v4l_id_SOURCES = \
         src/udev/v4l_id/v4l_id.c
  
  v4l_id_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         v4l_id
@@ -4026,9 +3804,7 @@ accelerometer_SOURCES = \
         src/udev/accelerometer/accelerometer.c
  
  accelerometer_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  udevlibexec_PROGRAMS += \
         accelerometer
@@ -4053,8 +3829,7 @@ test_id128_SOURCES = \
         src/test/test-id128.c
  
  test_id128_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  tests += \
         test-id128
@@ -4068,8 +3843,7 @@ systemd_activate_SOURCES = \
         src/activate/activate.c
  
  systemd_activate_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  systemd_journald_SOURCES = \
@@ -4077,15 +3851,14 @@ systemd_journald_SOURCES = \
         src/journal/journald-server.h
  
  systemd_journald_LDADD = \
-       libsystemd-journal-core.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libjournal-core.la \
+       libshared.la
  
  systemd_cat_SOURCES = \
         src/journal/cat.c
  
  systemd_cat_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  if HAVE_MICROHTTPD
  rootlibexec_PROGRAMS += \
@@ -4100,8 +3873,7 @@ systemd_journal_remote_SOURCES = \
         src/journal-remote/journal-remote.c
  
  systemd_journal_remote_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  systemd_journal_remote_SOURCES += \
         src/journal-remote/microhttpd-util.h \
@@ -4167,9 +3939,7 @@ systemd_journal_upload_CFLAGS = \
         $(LIBCURL_CFLAGS)
  
  systemd_journal_upload_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(LIBCURL_LIBS)
  
  nodist_systemunit_DATA += \
@@ -4192,15 +3962,7 @@ journalctl_SOURCES = \
         src/journal/journalctl.c
  
  journalctl_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-logs.la \
-       libsystemd-shared.la
-
-if HAVE_ACL
-journalctl_LDADD += \
-       libsystemd-acl.la
-endif
+       libshared.la
  
  if HAVE_QRENCODE
  journalctl_SOURCES += \
@@ -4218,67 +3980,67 @@ test_journal_SOURCES = \
         src/journal/test-journal.c
  
  test_journal_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_send_SOURCES = \
         src/journal/test-journal-send.c
  
  test_journal_send_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_syslog_SOURCES = \
         src/journal/test-journal-syslog.c
  
  test_journal_syslog_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_match_SOURCES = \
         src/journal/test-journal-match.c
  
  test_journal_match_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_enum_SOURCES = \
         src/journal/test-journal-enum.c
  
  test_journal_enum_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_stream_SOURCES = \
         src/journal/test-journal-stream.c
  
  test_journal_stream_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_flush_SOURCES = \
         src/journal/test-journal-flush.c
  
  test_journal_flush_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_init_SOURCES = \
         src/journal/test-journal-init.c
  
  test_journal_init_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_verify_SOURCES = \
         src/journal/test-journal-verify.c
  
  test_journal_verify_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_journal_interleaving_SOURCES = \
         src/journal/test-journal-interleaving.c
  
  test_journal_interleaving_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_mmap_cache_SOURCES = \
         src/journal/test-mmap-cache.c
  
  test_mmap_cache_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_catalog_SOURCES = \
         src/journal/test-catalog.c
@@ -4288,29 +4050,27 @@ test_catalog_CPPFLAGS = \
         -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
  
  test_catalog_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  test_compress_SOURCES = \
         src/journal/test-compress.c
  
  test_compress_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_compress_benchmark_SOURCES = \
         src/journal/test-compress-benchmark.c
  
  test_compress_benchmark_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_audit_type_SOURCES = \
         src/journal/test-audit-type.c
  
  test_audit_type_LDADD = \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
-libsystemd_journal_core_la_SOURCES = \
+libjournal_core_la_SOURCES = \
         src/journal/journald-kmsg.c \
         src/journal/journald-kmsg.h \
         src/journal/journald-syslog.c \
@@ -4331,22 +4091,14 @@ libsystemd_journal_core_la_SOURCES = \
         src/journal/journald-rate-limit.h \
         src/journal/journal-internal.h
  
-nodist_libsystemd_journal_core_la_SOURCES = \
+nodist_libjournal_core_la_SOURCES = \
         src/journal/journald-gperf.c
  
-libsystemd_journal_core_la_LIBADD = \
-       libsystemd-journal-internal.la \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
-if HAVE_ACL
-libsystemd_journal_core_la_LIBADD += \
-       libsystemd-acl.la
-endif
+libjournal_core_la_LIBADD = \
+       libshared.la
  
  noinst_LTLIBRARIES += \
-       libsystemd-journal-core.la
+       libjournal-core.la
  
  journal-install-hook:
         -$(MKDIR_P) $(DESTDIR)/var/log/journal
@@ -4495,11 +4247,14 @@ dist_pkgsysconf_DATA += \
         src/journal/journald.conf
  
  dist_catalog_DATA = \
+       catalog/systemd.be.catalog \
+       catalog/systemd.be@latin.catalog \
         catalog/systemd.fr.catalog \
         catalog/systemd.it.catalog \
         catalog/systemd.pl.catalog \
         catalog/systemd.pt_BR.catalog \
         catalog/systemd.ru.catalog \
+       catalog/systemd.zh_TW.catalog \
         catalog/systemd.catalog
  
  SOCKETS_TARGET_WANTS += \
@@ -4533,10 +4288,7 @@ systemd_journal_gatewayd_SOURCES = \
         src/journal-remote/microhttpd-util.c
  
  systemd_journal_gatewayd_LDADD = \
-       libsystemd-logs.la \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(MICROHTTPD_LIBS)
  
  if HAVE_GNUTLS
@@ -4572,11 +4324,7 @@ systemd_socket_proxyd_SOURCES = \
         src/socket-proxy/socket-proxyd.c
  
  systemd_socket_proxyd_LDADD = \
-       libsystemd-logs.la \
-       libsystemd-internal.la \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la \
-       libsystemd-resolve.la
+       libshared.la
  
  # ------------------------------------------------------------------------------
  if ENABLE_COREDUMP
@@ -4586,9 +4334,7 @@ systemd_coredump_SOURCES = \
         src/journal/coredump-vacuum.h
  
  systemd_coredump_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  if HAVE_ELFUTILS
  systemd_coredump_SOURCES += \
@@ -4605,18 +4351,11 @@ rootlibexec_PROGRAMS += \
  dist_pkgsysconf_DATA += \
         src/journal/coredump.conf
  
-if HAVE_ACL
-systemd_coredump_LDADD += \
-       libsystemd-acl.la
-endif
-
  coredumpctl_SOURCES = \
         src/journal/coredumpctl.c
  
  coredumpctl_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  bin_PROGRAMS += \
         coredumpctl
@@ -4630,8 +4369,7 @@ test_coredump_vacuum_SOURCES = \
         src/journal/coredump-vacuum.h
  
  test_coredump_vacuum_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  dist_bashcompletion_DATA += \
         shell-completion/bash/coredumpctl
@@ -4655,7 +4393,7 @@ systemd_binfmt_SOURCES = \
         src/binfmt/binfmt.c
  
  systemd_binfmt_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-binfmt
@@ -4686,7 +4424,7 @@ systemd_vconsole_setup_SOURCES = \
         src/vconsole/vconsole-setup.c
  
  systemd_vconsole_setup_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-vconsole-setup
@@ -4716,8 +4454,7 @@ systemd_bootchart_SOURCES = \
         src/bootchart/svg.h
  
  systemd_bootchart_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-bootchart
@@ -4744,7 +4481,7 @@ systemd_quotacheck_SOURCES = \
         src/quotacheck/quotacheck.c
  
  systemd_quotacheck_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  endif
  
  EXTRA_DIST += \
@@ -4765,7 +4502,7 @@ systemd_random_seed_SOURCES = \
         src/random-seed/random-seed.c
  
  systemd_random_seed_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  SYSINIT_TARGET_WANTS += \
         systemd-random-seed.service
@@ -4787,9 +4524,7 @@ systemd_backlight_SOURCES = \
         src/backlight/backlight.c
  
  systemd_backlight_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  endif
  
  EXTRA_DIST += \
@@ -4807,9 +4542,7 @@ systemd_rfkill_SOURCES = \
         src/rfkill/rfkill.c
  
  systemd_rfkill_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  endif
  
  EXTRA_DIST += \
@@ -4835,16 +4568,14 @@ systemd_cryptsetup_CFLAGS = \
         $(LIBCRYPTSETUP_CFLAGS)
  
  systemd_cryptsetup_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(LIBCRYPTSETUP_LIBS)
  
  systemd_cryptsetup_generator_SOURCES = \
         src/cryptsetup/cryptsetup-generator.c
  
  systemd_cryptsetup_generator_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  SYSINIT_TARGET_WANTS += \
         cryptsetup.target
@@ -4857,8 +4588,7 @@ systemd_hostnamed_SOURCES = \
         src/hostname/hostnamed.c
  
  systemd_hostnamed_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-hostnamed
@@ -4888,8 +4618,7 @@ hostnamectl_SOURCES = \
         src/hostname/hostnamectl.c
  
  hostnamectl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  bin_PROGRAMS += \
         hostnamectl
@@ -4921,8 +4650,7 @@ systemd_localed_SOURCES = \
         src/locale/localed.c
  
  systemd_localed_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(XKBCOMMON_LIBS)
  
  systemd_localed_CFLAGS = \
@@ -4961,8 +4689,7 @@ localectl_SOURCES = \
         src/locale/localectl.c
  
  localectl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  bin_PROGRAMS += \
         localectl
@@ -4989,8 +4716,7 @@ systemd_timedated_SOURCES = \
         src/timedate/timedated.c
  
  systemd_timedated_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-timedated
@@ -5020,8 +4746,7 @@ timedatectl_SOURCES = \
         src/timedate/timedatectl.c
  
  timedatectl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  bin_PROGRAMS += \
         timedatectl
@@ -5057,10 +4782,8 @@ gperf_gperf_sources += \
         src/timesync/timesyncd-gperf.gperf
  
  systemd_timesyncd_LDADD = \
-       libsystemd-resolve.la \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-timesyncd
@@ -5097,8 +4820,7 @@ libnss_myhostname_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym
  
  libnss_myhostname_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  lib_LTLIBRARIES += \
         libnss_myhostname.la
@@ -5111,12 +4833,12 @@ systemd_machined_SOURCES = \
         src/machine/machined.h
  
  systemd_machined_LDADD = \
-       libsystemd-machine-core.la
+       libmachine-core.la
  
  rootlibexec_PROGRAMS += \
         systemd-machined
  
-libsystemd_machine_core_la_SOURCES = \
+libmachine_core_la_SOURCES = \
         src/machine/machine.c \
         src/machine/machine.h \
         src/machine/machined-dbus.c \
@@ -5125,23 +4847,17 @@ libsystemd_machine_core_la_SOURCES = \
         src/machine/image-dbus.c \
         src/machine/image-dbus.h
  
-libsystemd_machine_core_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-machine.la \
-       libsystemd-shared.la
+libmachine_core_la_LIBADD = \
+       libshared.la
  
  noinst_LTLIBRARIES += \
-       libsystemd-machine-core.la
+       libmachine-core.la
  
  machinectl_SOURCES = \
         src/machine/machinectl.c
  
  machinectl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-logs.la \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         machinectl
@@ -5153,7 +4869,7 @@ test_machine_tables_SOURCES = \
         src/machine/test-machine-tables.c
  
  test_machine_tables_LDADD = \
-       libsystemd-machine-core.la
+       libmachine-core.la
  
  tests += \
         test-machine-tables
@@ -5176,9 +4892,6 @@ dist_dbuspolicy_DATA += \
  polkitpolicy_files += \
         src/machine/org.freedesktop.machine1.policy
  
-polkitpolicy_in_files += \
-       src/machine/org.freedesktop.machine1.policy.in
-
  dist_zshcompletion_DATA += \
         shell-completion/zsh/_machinectl \
         shell-completion/zsh/_sd_machines
@@ -5203,14 +4916,16 @@ libnss_mymachines_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym
  
  libnss_mymachines_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libshared.la
  
  lib_LTLIBRARIES += \
         libnss_mymachines.la
  
  endif
  
+polkitpolicy_in_files += \
+       src/machine/org.freedesktop.machine1.policy.in
+
  EXTRA_DIST += \
         units/systemd-machined.service.in
  
@@ -5239,9 +4954,7 @@ systemd_importd_CFLAGS = \
         -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
  
  systemd_importd_LDADD = \
-       libsystemd-machine.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  systemd_pull_SOURCES = \
         src/import/pull.c \
@@ -5276,9 +4989,7 @@ systemd_pull_CFLAGS = \
         -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
  
  systemd_pull_LDADD = \
-       libsystemd-machine.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(LIBCURL_LIBS) \
         $(XZ_LIBS) \
         $(ZLIB_LIBS) \
@@ -5304,9 +5015,7 @@ systemd_import_CFLAGS = \
         $(ZLIB_CFLAGS)
  
  systemd_import_LDADD = \
-       libsystemd-machine.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(XZ_LIBS) \
         $(ZLIB_LIBS) \
         -lbz2
@@ -5328,9 +5037,7 @@ systemd_export_CFLAGS = \
         $(ZLIB_CFLAGS)
  
  systemd_export_LDADD = \
-       libsystemd-machine.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(XZ_LIBS) \
         $(ZLIB_LIBS) \
         -lbz2
@@ -5359,9 +5066,6 @@ dist_dbuspolicy_DATA += \
  polkitpolicy_files += \
         src/import/org.freedesktop.import1.policy
  
-polkitpolicy_in_files += \
-       src/import/org.freedesktop.import1.policy.in
-
  manual_tests += \
         test-qcow2
  
@@ -5375,8 +5079,7 @@ test_qcow2_CFLAGS = \
         $(ZLIB_CFLAGS)
  
  test_qcow2_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(ZLIB_LIBS)
  
  endif
@@ -5387,6 +5090,9 @@ endif
  
  endif
  
+polkitpolicy_in_files += \
+       src/import/org.freedesktop.import1.policy.in
+
  EXTRA_DIST += \
         units/systemd-importd.service.in \
         src/resolve/resolved.conf.in
@@ -5405,8 +5111,6 @@ systemd_resolved_SOURCES = \
         src/resolve/resolved-link.h \
         src/resolve/resolved-link.c \
         src/resolve/resolved-def.h \
-       src/resolve/resolved-dns-domain.h \
-       src/resolve/resolved-dns-domain.c \
         src/resolve/resolved-dns-rr.h \
         src/resolve/resolved-dns-rr.c \
         src/resolve/resolved-dns-question.h \
@@ -5445,9 +5149,7 @@ gperf_txt_sources += \
  
  systemd_resolved_LDADD = \
         libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-resolved
@@ -5479,17 +5181,6 @@ nodist_pkgsysconf_DATA += \
  tests += \
         test-dns-domain
  
-test_dns_domain_SOURCES = \
-       src/resolve/resolved-dns-domain.h \
-       src/resolve/resolved-dns-domain.c \
-       src/resolve/test-dns-domain.c
-
-test_dns_domain_LDADD = \
-       libsystemd-network.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
-       $(LIBIDN_LIBS)
-
  libnss_resolve_la_SOURCES = \
         src/nss-resolve/nss-resolve.sym \
         src/nss-resolve/nss-resolve.c
@@ -5504,8 +5195,7 @@ libnss_resolve_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
  
  libnss_resolve_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  lib_LTLIBRARIES += \
         libnss_resolve.la
@@ -5520,8 +5210,6 @@ systemd_resolve_host_SOURCES = \
         src/resolve/resolved-dns-answer.h \
         src/resolve/resolved-dns-question.c \
         src/resolve/resolved-dns-question.h \
-       src/resolve/resolved-dns-domain.c \
-       src/resolve/resolved-dns-domain.h \
         src/resolve/dns-type.c \
         src/resolve/dns-type.h
  
@@ -5530,9 +5218,7 @@ nodist_systemd_resolve_host_SOURCES = \
         src/resolve/dns_type-to-name.h
  
  systemd_resolve_host_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-resolve-host
@@ -5551,20 +5237,20 @@ systemd_networkd_SOURCES = \
         src/network/networkd.c
  
  systemd_networkd_LDADD = \
-       libsystemd-networkd-core.la
+       libnetworkd-core.la
  
  if HAVE_LIBIPTC
  systemd_networkd_LDADD += \
-       libsystemd-fw.la
+       libfirewall.la
  endif
  
  noinst_LTLIBRARIES += \
-       libsystemd-networkd-core.la
+       libnetworkd-core.la
  
-libsystemd_networkd_core_la_CFLAGS = \
+libnetworkd_core_la_CFLAGS = \
         $(AM_CFLAGS)
  
-libsystemd_networkd_core_la_SOURCES = \
+libnetworkd_core_la_SOURCES = \
         src/libsystemd-network/network-internal.h \
         src/network/networkd.h \
         src/network/networkd-link.h \
@@ -5604,15 +5290,13 @@ libsystemd_networkd_core_la_SOURCES = \
         src/network/networkd-fdb.c \
         src/network/networkd-address-pool.c
  
-nodist_libsystemd_networkd_core_la_SOURCES = \
+nodist_libnetworkd_core_la_SOURCES = \
         src/network/networkd-network-gperf.c \
         src/network/networkd-netdev-gperf.c
  
-libsystemd_networkd_core_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
+libnetworkd_core_la_LIBADD = \
         libsystemd-network.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-networkd-wait-online
@@ -5630,9 +5314,7 @@ systemd_networkd_wait_online_SOURCES = \
  
  systemd_networkd_wait_online_LDADD = \
         libsystemd-network.la \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         networkctl
@@ -5641,20 +5323,18 @@ networkctl_SOURCES = \
         src/network/networkctl.c
  
  networkctl_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         libsystemd-network.la
  
  test_network_SOURCES = \
         src/network/test-network.c
  
  test_network_LDADD = \
-       libsystemd-networkd-core.la
+       libnetworkd-core.la
  
  if HAVE_LIBIPTC
  test_network_LDADD += \
-       libsystemd-fw.la
+       libfirewall.la
  endif
  
  test_network_tables_SOURCES = \
@@ -5662,12 +5342,12 @@ test_network_tables_SOURCES = \
         src/shared/test-tables.h
  
  test_network_tables_LDADD = \
-       libsystemd-networkd-core.la \
+       libnetworkd-core.la \
         libudev-core.la
  
  if HAVE_LIBIPTC
  test_network_tables_LDADD += \
-       libsystemd-fw.la
+       libfirewall.la
  endif
  
  tests += \
@@ -5720,9 +5400,9 @@ nodist_systemd_logind_SOURCES = \
         src/login/logind-gperf.c
  
  systemd_logind_LDADD = \
-       libsystemd-logind-core.la
+       liblogind-core.la
  
-libsystemd_logind_core_la_SOURCES = \
+liblogind_core_la_SOURCES = \
         src/login/logind-core.c \
         src/login/logind-device.c \
         src/login/logind-device.h \
@@ -5747,21 +5427,16 @@ libsystemd_logind_core_la_SOURCES = \
         src/login/logind-utmp.c \
         src/login/logind-acl.h
  
-libsystemd_logind_core_la_LIBADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+liblogind_core_la_LIBADD = \
+       libshared.la
  
  if HAVE_ACL
-libsystemd_logind_core_la_SOURCES += \
+liblogind_core_la_SOURCES += \
         src/login/logind-acl.c
-
-libsystemd_logind_core_la_LIBADD += \
-       libsystemd-acl.la
  endif
  
  noinst_LTLIBRARIES += \
-       libsystemd-logind-core.la
+       liblogind-core.la
  
  rootlibexec_PROGRAMS += \
         systemd-logind
@@ -5772,11 +5447,7 @@ loginctl_SOURCES = \
         src/login/sysfs-show.c
  
  loginctl_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-logs.la \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         loginctl
@@ -5792,8 +5463,7 @@ systemd_inhibit_SOURCES = \
         src/login/inhibit.c
  
  systemd_inhibit_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  rootbin_PROGRAMS += \
         systemd-inhibit
@@ -5802,28 +5472,25 @@ test_login_SOURCES = \
         src/libsystemd/sd-login/test-login.c
  
  test_login_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_login_shared_SOURCES = \
         src/login/test-login-shared.c
  
  test_login_shared_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_inhibit_SOURCES = \
         src/login/test-inhibit.c
  
  test_inhibit_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
  
  test_login_tables_SOURCES = \
         src/login/test-login-tables.c
  
  test_login_tables_LDADD = \
-       libsystemd-logind-core.la
+       liblogind-core.la
  
  manual_tests += \
         test-login \
@@ -5840,8 +5507,7 @@ pam_systemd_la_SOURCES = \
  
  pam_systemd_la_CFLAGS = \
         $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       -fvisibility=hidden
+       $(PAM_CFLAGS)
  
  pam_systemd_la_LDFLAGS = \
         $(AM_LDFLAGS) \
@@ -5852,8 +5518,7 @@ pam_systemd_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
  
  pam_systemd_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+       libshared.la \
         $(PAM_LIBS)
  
  pamlib_LTLIBRARIES = \
@@ -5925,7 +5590,7 @@ systemd_user_sessions_SOURCES = \
         src/user-sessions/user-sessions.c
  
  systemd_user_sessions_LDADD = \
-       libsystemd-shared.la
+       libshared.la
  
  rootlibexec_PROGRAMS += \
         systemd-user-sessions
@@ -5991,7 +5656,7 @@ id128_la_LDFLAGS = \
  
  id128_la_LIBADD = \
         $(PYTHON_DEVEL_LIBS) \
-       libsystemd-shared.la \
+       libshared.la \
         libsystemd.la
  
  _daemon_la_SOURCES = \
@@ -6013,7 +5678,7 @@ _daemon_la_LDFLAGS = \
  
  _daemon_la_LIBADD = \
         $(PYTHON_DEVEL_LIBS) \
-       libsystemd-shared.la \
+       libshared.la \
         libsystemd.la
  
  _reader_la_SOURCES = \
@@ -6034,7 +5699,7 @@ _reader_la_LDFLAGS = \
  
  _reader_la_LIBADD = \
         $(PYTHON_DEVEL_LIBS) \
-       libsystemd-shared.la \
+       libshared.la \
         libsystemd.la
  
  login_la_SOURCES = \
@@ -6055,7 +5720,7 @@ login_la_LDFLAGS = \
  
  login_la_LIBADD = \
         $(PYTHON_DEVEL_LIBS) \
-       libsystemd-shared.la \
+       libshared.la \
         libsystemd.la
  
  dist_pkgpyexec_PYTHON = \
@@ -6127,8 +5792,7 @@ libsystemd_journal_la_LDFLAGS = \
  
  libsystemd_journal_la_LIBADD = \
         libsystemd-journal-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-internal.la
  
  libsystemd_login_la_SOURCES = \
         libsystemd-login.c \
@@ -6144,8 +5808,7 @@ libsystemd_login_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
  
  libsystemd_login_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-internal.la
  
  libsystemd_id128_la_SOURCES = \
         libsystemd-id128.c \
@@ -6161,8 +5824,7 @@ libsystemd_id128_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
  
  libsystemd_id128_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-internal.la
  
  libsystemd_daemon_la_SOURCES = \
         libsystemd-daemon.c \
@@ -6178,8 +5840,7 @@ libsystemd_daemon_la_LDFLAGS = \
         -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
  
  libsystemd_daemon_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-internal.la
  
  lib_LTLIBRARIES += \
         libsystemd-journal.la \
@@ -6275,6 +5936,7 @@ substitutions = \
         '|systemgidmax=$(SYSTEM_GID_MAX)|' \
         '|TTY_GID=$(TTY_GID)|' \
         '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
         '|binfmtdir=$(binfmtdir)|' \
         '|modulesloaddir=$(modulesloaddir)|'
  
@@ -6494,10 +6156,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 \
@@ -6558,7 +6218,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
@@ -6619,11 +6278,6 @@ 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)"