libsystemd-dhcp: revert merge into libsystemd

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 725a37563a59edc5cfe1073348b7c36db5616fd9..8a897cddd444d2e94f99f0f8812be13675d6a660 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_BUS_CURRENT=0
-LIBSYSTEMD_BUS_REVISION=0
-LIBSYSTEMD_BUS_AGE=0
+LIBSYSTEMD_CURRENT=0
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -189,8 +189,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/udev \
        -I $(top_srcdir)/src/udev/net \
        -I $(top_builddir)/src/udev \
-       -I $(top_srcdir)/src/libsystemd-bus \
-       -I $(top_srcdir)/src/libsystemd-rtnl \
+       -I $(top_srcdir)/src/libsystemd \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -640,31 +639,6 @@ EXTRA_DIST += \
        make-directive-index.py \
        xml_helper.py
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-rtnl.la
-
-libsystemd_rtnl_la_SOURCES = \
-       src/systemd/sd-rtnl.h \
-       src/libsystemd-rtnl/sd-rtnl.c \
-       src/libsystemd-rtnl/rtnl-internal.h \
-       src/libsystemd-rtnl/rtnl-message.c \
-       src/libsystemd-rtnl/rtnl-util.h \
-       src/libsystemd-rtnl/rtnl-util.c
-
-test_rtnl_SOURCES = \
-       src/libsystemd-rtnl/test-rtnl.c
-
-test_rtnl_LDADD = \
-       libsystemd-rtnl.la \
-       libsystemd-bus-internal.la \
-       libsystemd-daemon-internal.la \
-       libsystemd-id128-internal.la \
-       libsystemd-shared.la
-
-tests += \
-       test-rtnl
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-shared.la
@@ -1027,8 +1001,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
-       libsystemd-rtnl.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
@@ -1482,7 +1455,7 @@ systemd_analyze_SOURCES = \
        src/analyze/analyze.c
 
 systemd_analyze_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -1492,7 +1465,7 @@ systemd_initctl_SOURCES = \
        src/initctl/initctl.c
 
 systemd_initctl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -1506,7 +1479,7 @@ systemd_update_utmp_CFLAGS = \
        $(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
@@ -1658,7 +1631,7 @@ systemd_fsck_SOURCES = \
        src/fsck/fsck.c
 
 systemd_fsck_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
@@ -1771,6 +1744,7 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
+if ENABLE_KDBUS
 systemgenerator_PROGRAMS +=  \
        systemd-dbus1-generator
 
@@ -1780,7 +1754,17 @@ systemd_dbus1_generator_SOURCES = \
 systemd_dbus1_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-bus-internal.la
+       libsystemd-internal.la
+
+dbus1-generator-install-hook:
+       $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+dbus1-generator-uninstall-hook:
+       rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
+UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+endif
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
@@ -1805,7 +1789,7 @@ systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent/cgroups-agent.c
 
 systemd_cgroups_agent_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -1817,7 +1801,7 @@ systemctl_SOURCES = \
 systemctl_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-logs.la
 
 if ENABLE_LOGIND
@@ -1880,11 +1864,10 @@ systemd_nspawn_SOURCES = \
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
-       libsystemd-shared.la \
-       libsystemd-rtnl.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1893,7 +1876,7 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
@@ -1903,7 +1886,7 @@ systemd_bus_proxyd_SOURCES = \
        src/bus-proxyd/bus-proxyd.c
 
 systemd_bus_proxyd_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
@@ -1991,114 +1974,125 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.pc.in
 
 # ------------------------------------------------------------------------------
-libsystemd_bus_la_SOURCES = \
-       src/libsystemd-bus/libsystemd-bus.sym \
+libsystemd_la_SOURCES = \
+       src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
        src/systemd/sd-memfd.h \
        src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
-       src/libsystemd-bus/sd-bus.c \
-       src/libsystemd-bus/bus-control.c \
-       src/libsystemd-bus/bus-control.h \
-       src/libsystemd-bus/bus-error.c \
-       src/libsystemd-bus/bus-error.h \
-       src/libsystemd-bus/bus-internal.c \
-       src/libsystemd-bus/bus-internal.h \
-       src/libsystemd-bus/bus-socket.c \
-       src/libsystemd-bus/bus-socket.h \
-       src/libsystemd-bus/bus-kernel.c \
-       src/libsystemd-bus/bus-kernel.h \
-       src/libsystemd-bus/bus-container.c \
-       src/libsystemd-bus/bus-container.h \
-       src/libsystemd-bus/bus-message.c \
-       src/libsystemd-bus/bus-message.h \
-       src/libsystemd-bus/bus-creds.c \
-       src/libsystemd-bus/bus-creds.h \
-       src/libsystemd-bus/bus-signature.c \
-       src/libsystemd-bus/bus-signature.h \
-       src/libsystemd-bus/bus-type.c \
-       src/libsystemd-bus/bus-type.h \
-       src/libsystemd-bus/bus-match.c \
-       src/libsystemd-bus/bus-match.h \
-       src/libsystemd-bus/bus-bloom.c \
-       src/libsystemd-bus/bus-bloom.h \
-       src/libsystemd-bus/bus-introspect.c \
-       src/libsystemd-bus/bus-introspect.h \
-       src/libsystemd-bus/bus-objects.c \
-       src/libsystemd-bus/bus-objects.h \
-       src/libsystemd-bus/bus-gvariant.c \
-       src/libsystemd-bus/bus-gvariant.h \
-       src/libsystemd-bus/bus-convenience.c \
-       src/libsystemd-bus/kdbus.h \
-       src/libsystemd-bus/sd-memfd.c \
-       src/libsystemd-bus/bus-util.c \
-       src/libsystemd-bus/bus-util.h \
-       src/libsystemd-bus/sd-utf8.c \
-       src/libsystemd-bus/sd-event.c \
-       src/libsystemd-bus/event-util.h \
-       src/libsystemd-bus/bus-protocol.h
-
-nodist_libsystemd_bus_la_SOURCES = \
-       src/libsystemd-bus/bus-error-mapping.c
-
-libsystemd_bus_la_LIBADD = \
+       src/systemd/sd-rtnl.h \
+       src/systemd/sd-resolve.h \
+       src/libsystemd/sd-bus.c \
+       src/libsystemd/bus-control.c \
+       src/libsystemd/bus-control.h \
+       src/libsystemd/bus-error.c \
+       src/libsystemd/bus-error.h \
+       src/libsystemd/bus-internal.c \
+       src/libsystemd/bus-internal.h \
+       src/libsystemd/bus-socket.c \
+       src/libsystemd/bus-socket.h \
+       src/libsystemd/bus-kernel.c \
+       src/libsystemd/bus-kernel.h \
+       src/libsystemd/bus-container.c \
+       src/libsystemd/bus-container.h \
+       src/libsystemd/bus-message.c \
+       src/libsystemd/bus-message.h \
+       src/libsystemd/bus-creds.c \
+       src/libsystemd/bus-creds.h \
+       src/libsystemd/bus-signature.c \
+       src/libsystemd/bus-signature.h \
+       src/libsystemd/bus-type.c \
+       src/libsystemd/bus-type.h \
+       src/libsystemd/bus-match.c \
+       src/libsystemd/bus-match.h \
+       src/libsystemd/bus-bloom.c \
+       src/libsystemd/bus-bloom.h \
+       src/libsystemd/bus-introspect.c \
+       src/libsystemd/bus-introspect.h \
+       src/libsystemd/bus-objects.c \
+       src/libsystemd/bus-objects.h \
+       src/libsystemd/bus-gvariant.c \
+       src/libsystemd/bus-gvariant.h \
+       src/libsystemd/bus-convenience.c \
+       src/libsystemd/kdbus.h \
+       src/libsystemd/sd-memfd.c \
+       src/libsystemd/bus-util.c \
+       src/libsystemd/bus-util.h \
+       src/libsystemd/sd-utf8.c \
+       src/libsystemd/sd-event.c \
+       src/libsystemd/event-util.h \
+       src/libsystemd/bus-protocol.h \
+       src/libsystemd/sd-rtnl.c \
+       src/libsystemd/rtnl-internal.h \
+       src/libsystemd/rtnl-message.c \
+       src/libsystemd/rtnl-util.h \
+       src/libsystemd/rtnl-util.c \
+       src/libsystemd/sd-resolve.c \
+       src/libsystemd/resolve-util.h
+
+nodist_libsystemd_la_SOURCES = \
+       src/libsystemd/bus-error-mapping.c
+
+libsystemd_la_LIBADD = \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
-libsystemd_bus_la_CFLAGS = \
+libsystemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-       -pthread
+       -pthread \
+       -lresolv
 
-libsystemd_bus_la_LDFLAGS = \
+libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym
+       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
 pkgconfiglib_DATA += \
-       src/libsystemd-bus/libsystemd-bus.pc
+       src/libsystemd/libsystemd.pc
 
 EXTRA_DIST += \
-       src/libsystemd-bus/bus-error-mapping.gperf \
-       src/libsystemd-bus/libsystemd-bus.pc.in \
-       src/libsystemd-bus/DIFFERENCES \
-       src/libsystemd-bus/GVARIANT-SERIALIZATION
+       src/libsystemd/bus-error-mapping.gperf \
+       src/libsystemd/libsystemd.pc.in \
+       src/libsystemd/DIFFERENCES \
+       src/libsystemd/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
-       src/libsystemd-bus/bus-error-mapping.c
+       src/libsystemd/bus-error-mapping.c
 
 lib_LTLIBRARIES += \
-       libsystemd-bus.la
+       libsystemd.la
 
-libsystemd_bus_internal_la_SOURCES = \
-       $(libsystemd_bus_la_SOURCES)
+libsystemd_internal_la_SOURCES = \
+       $(libsystemd_la_SOURCES)
 
-nodist_libsystemd_bus_internal_la_SOURCES = \
-       $(nodist_libsystemd_bus_la_SOURCES)
+nodist_libsystemd_internal_la_SOURCES = \
+       $(nodist_libsystemd_la_SOURCES)
 
-libsystemd_bus_internal_la_CFLAGS = \
-       $(libsystemd_bus_la_CFLAGS)
+libsystemd_internal_la_CFLAGS = \
+       $(libsystemd_la_CFLAGS)
 
 noinst_LTLIBRARIES += \
-       libsystemd-bus-internal.la
+       libsystemd-internal.la
 
-libsystemd_bus_dump_la_SOURCES = \
-       src/libsystemd-bus/bus-dump.c \
-       src/libsystemd-bus/bus-dump.h
+libsystemd_dump_la_SOURCES = \
+       src/libsystemd/bus-dump.c \
+       src/libsystemd/bus-dump.h
 
-libsystemd_bus_dump_la_CFLAGS = \
+libsystemd_dump_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
-       libsystemd-bus-dump.la
+       libsystemd-dump.la
 
 tests += \
        test-bus-marshal \
        test-bus-signature \
        test-bus-chat \
+       test-bus-cleanup \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
@@ -2111,20 +2105,22 @@ tests += \
        test-bus-error \
        test-bus-creds \
        test-bus-gvariant \
-       test-event
+       test-event \
+       test-rtnl \
+       test-resolve
 
 bin_PROGRAMS += \
        busctl
 
 test_bus_marshal_SOURCES = \
-       src/libsystemd-bus/test-bus-marshal.c
+       src/libsystemd/test-bus-marshal.c
 
 test_bus_marshal_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(GLIB_LIBS) \
        $(DBUS_LIBS) \
@@ -2137,40 +2133,49 @@ test_bus_marshal_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_signature_SOURCES = \
-       src/libsystemd-bus/test-bus-signature.c
+       src/libsystemd/test-bus-signature.c
 
 test_bus_signature_LDADD = \
        libsystemd-shared.la \
-       libsystemd-bus-internal.la
+       libsystemd-internal.la
 
 test_bus_chat_SOURCES = \
-       src/libsystemd-bus/test-bus-chat.c
+       src/libsystemd/test-bus-chat.c
 
 test_bus_chat_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
 test_bus_chat_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
+test_bus_cleanup_SOURCES = \
+       src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_server_SOURCES = \
-       src/libsystemd-bus/test-bus-server.c
+       src/libsystemd/test-bus-server.c
 
 test_bus_server_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
 test_bus_server_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
-       src/libsystemd-bus/test-bus-objects.c
+       src/libsystemd/test-bus-objects.c
 
 test_bus_objects_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2178,32 +2183,32 @@ test_bus_objects_CFLAGS = \
        -pthread
 
 test_bus_objects_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(CAP_LIBS)
 
 test_bus_error_SOURCES = \
-       src/libsystemd-bus/test-bus-error.c
+       src/libsystemd/test-bus-error.c
 
 test_bus_error_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
-       src/libsystemd-bus/test-bus-gvariant.c
+       src/libsystemd/test-bus-gvariant.c
 
 test_bus_gvariant_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(GLIB_LIBS) \
        $(CAP_LIBS)
@@ -2214,34 +2219,34 @@ test_bus_gvariant_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_creds_SOURCES = \
-       src/libsystemd-bus/test-bus-creds.c
+       src/libsystemd/test-bus-creds.c
 
 test_bus_creds_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la
 
 test_bus_match_SOURCES = \
-       src/libsystemd-bus/test-bus-match.c
+       src/libsystemd/test-bus-match.c
 
 test_bus_match_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
-       src/libsystemd-bus/test-bus-kernel.c
+       src/libsystemd/test-bus-kernel.c
 
 test_bus_kernel_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(CAP_LIBS)
 
@@ -2250,39 +2255,39 @@ test_bus_kernel_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_kernel_bloom_SOURCES = \
-       src/libsystemd-bus/test-bus-kernel-bloom.c
+       src/libsystemd/test-bus-kernel-bloom.c
 
 test_bus_kernel_bloom_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_benchmark_SOURCES = \
-       src/libsystemd-bus/test-bus-kernel-benchmark.c
+       src/libsystemd/test-bus-kernel-benchmark.c
 
 test_bus_kernel_benchmark_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_memfd_SOURCES = \
-       src/libsystemd-bus/test-bus-memfd.c
+       src/libsystemd/test-bus-memfd.c
 
 test_bus_memfd_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 test_bus_zero_copy_SOURCES = \
-       src/libsystemd-bus/test-bus-zero-copy.c
+       src/libsystemd/test-bus-zero-copy.c
 
 test_bus_zero_copy_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(CAP_LIBS)
 
@@ -2291,30 +2296,51 @@ test_bus_zero_copy_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_introspect_SOURCES = \
-       src/libsystemd-bus/test-bus-introspect.c
+       src/libsystemd/test-bus-introspect.c
 
 test_bus_introspect_LDADD = \
        libsystemd-shared.la \
-       libsystemd-bus-internal.la
+       libsystemd-internal.la
 
 test_event_SOURCES = \
-       src/libsystemd-bus/test-event.c
+       src/libsystemd/test-event.c
 
 test_event_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_rtnl_SOURCES = \
+       src/libsystemd/test-rtnl.c
+
+test_rtnl_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
+
+test_resolve_SOURCES = \
+       src/systemd/sd-resolve.h \
+       src/libsystemd/test-resolve.c
+
+test_resolve_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_resolve_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
 busctl_SOURCES = \
-       src/libsystemd-bus/busctl.c
+       src/libsystemd/busctl.c
 
 busctl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus-dump.la \
+       libsystemd-dump.la \
        libsystemd-capability.la \
        $(CAP_LIBS)
 
@@ -2322,6 +2348,49 @@ busctl_CFLAGS = \
        $(AM_CFLAGS) \
        $(CAP_CFLAGS)
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-dhcp.la
+
+libsystemd_dhcp_la_SOURCES = \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/sd-dhcp-client.c \
+       src/libsystemd-dhcp/dhcp-network.c \
+       src/libsystemd-dhcp/dhcp-option.c \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/dhcp-protocol.h
+
+libsystemd_dhcp_la_LIBADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_dhcp_option_SOURCES = \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
+
+tests += \
+       test-dhcp-option \
+       test-dhcp-client
+
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 SUBDIRS += \
@@ -2546,7 +2615,7 @@ libudev_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       libsystemd-rtnl.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
@@ -2995,7 +3064,7 @@ systemd_journald_SOURCES = \
 
 systemd_journald_LDADD = \
        libsystemd-journal-core.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 systemd_cat_SOURCES = \
@@ -3356,7 +3425,7 @@ systemd_journal_gatewayd_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
 
@@ -3389,7 +3458,7 @@ systemd_socket_proxyd_SOURCES = \
 
 systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -3678,7 +3747,7 @@ systemd_hostnamed_SOURCES = \
 
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3711,7 +3780,7 @@ hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
 hostnamectl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3739,7 +3808,7 @@ systemd_bus_driverd_SOURCES = \
        src/bus-driverd/bus-driverd.c
 
 systemd_bus_driverd_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3767,7 +3836,8 @@ USER_UNIT_ALIASES += \
 endif
 
 EXTRA_DIST += \
-       units/systemd-bus-driverd.service.in
+       units/systemd-bus-driverd.service.in \
+       units/user/systemd-bus-driverd.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
@@ -3776,7 +3846,7 @@ systemd_localed_SOURCES = \
 
 systemd_localed_LDADD = \
        libsystemd-label.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3818,7 +3888,7 @@ localectl_SOURCES = \
        src/locale/localectl.c
 
 localectl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3847,7 +3917,7 @@ systemd_timedated_SOURCES = \
 
 systemd_timedated_LDADD = \
        libsystemd-label.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3884,7 +3954,7 @@ timedatectl_SOURCES = \
        src/timedate/timedatectl.c
 
 timedatectl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -3924,48 +3994,6 @@ lib_LTLIBRARIES += \
        libnss_myhostname.la
 endif
 
-# ------------------------------------------------------------------------------
-libsystemd_dhcp_la_SOURCES = \
-       src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/dhcp-protocol.h \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/dhcp-network.c \
-       src/libsystemd-dhcp/dhcp-option.c \
-       src/libsystemd-dhcp/dhcp-client.c
-
-noinst_LTLIBRARIES += \
-       libsystemd-dhcp.la
-
-libsystemd_dhcp_la_LIBADD = \
-       libsystemd-bus-internal.la \
-       libsystemd-shared.la
-
-test_dhcp_option_SOURCES = \
-       src/libsystemd-dhcp/dhcp-protocol.h \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/test-dhcp-option.c
-
-test_dhcp_option_LDADD = \
-       libsystemd-dhcp.la \
-       libsystemd-shared.la
-
-test_dhcp_client_SOURCES = \
-       src/libsystemd-dhcp/dhcp-protocol.h \
-       src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/test-dhcp-client.c
-
-test_dhcp_client_LDADD = \
-       libsystemd-bus-internal.la \
-       libsystemd-daemon-internal.la \
-       libsystemd-id128-internal.la \
-       libsystemd-dhcp.la \
-       libsystemd-shared.la
-
-tests += \
-       test-dhcp-option \
-       test-dhcp-client
-
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
@@ -3987,7 +4015,7 @@ libsystemd_machine_core_la_SOURCES = \
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -3999,7 +4027,7 @@ machinectl_SOURCES = \
        src/machine/machinectl.c
 
 machinectl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -4064,10 +4092,10 @@ nodist_systemd_networkd_SOURCES = \
 systemd_networkd_LDADD = \
        libudev-internal.la \
        libsystemd-daemon-internal.la \
-       libsystemd-bus-internal.la \
-       libsystemd-id128-internal.la \
-       libsystemd-rtnl.la \
+       libsystemd-internal.la \
        libsystemd-dhcp.la \
+       libsystemd-id128-internal.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -4089,11 +4117,11 @@ test_network_SOURCES = \
 
 test_network_LDADD = \
        libudev-internal.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
+       libsystemd-dhcp.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
-       libsystemd-rtnl.la \
-       libsystemd-dhcp.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 tests += \
@@ -4150,7 +4178,7 @@ libsystemd_logind_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -4180,7 +4208,7 @@ loginctl_SOURCES = \
        src/login/sysfs-show.c
 
 loginctl_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
        libsystemd-id128-internal.la \
@@ -4200,7 +4228,7 @@ systemd_inhibit_SOURCES = \
        src/login/inhibit.c
 
 systemd_inhibit_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
@@ -4226,7 +4254,7 @@ test_inhibit_SOURCES = \
        src/login/test-inhibit.c
 
 test_inhibit_LDADD = \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
@@ -4287,7 +4315,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
-       libsystemd-bus-internal.la \
+       libsystemd-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
@@ -4884,7 +4912,7 @@ hwdb-update:
        ./ids-update.pl )
 
 kdbus-update:
-       ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+       ( cd $(top_srcdir)/src/libsystemd/ && \
        wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
 upload: all distcheck
@@ -4916,7 +4944,7 @@ valgrind-tests: $(TESTS)
                if file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done
 
@@ -4963,8 +4991,8 @@ define generate-sym-test
        $(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-test-libsystemd-bus-sym.c: \
-       src/libsystemd-bus/libsystemd-bus.sym \
+test-libsystemd-sym.c: \
+       src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-utf8.h
        $(generate-sym-test)
@@ -4994,10 +5022,10 @@ test-libudev-sym.c: \
        src/udev/udev.h
        $(generate-sym-test)
 
-test_libsystemd_bus_sym_SOURCES = \
-       test-libsystemd-bus-sym.c
-test_libsystemd_bus_sym_LDADD = \
-       libsystemd-bus.la
+test_libsystemd_sym_SOURCES = \
+       test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+       libsystemd.la
 
 test_libsystemd_daemon_sym_SOURCES = \
        test-libsystemd-daemon-sym.c
@@ -5025,7 +5053,7 @@ test_libudev_sym_LDADD = \
        libudev.la
 
 BUILT_SOURCES += \
-       $(test_libsystemd_bus_sym_SOURCES) \
+       $(test_libsystemd_sym_SOURCES) \
        $(test_libsystemd_daemon_sym_SOURCES) \
        $(test_libsystemd_id128_sym_SOURCES) \
        $(test_libsystemd_journal_sym_SOURCES) \
@@ -5033,7 +5061,7 @@ BUILT_SOURCES += \
        $(test_libudev_sym_SOURCES)
 
 tests += \
-       test-libsystemd-bus-sym \
+       test-libsystemd-sym \
        test-libsystemd-daemon-sym \
        test-libsystemd-id128-sym \
        test-libsystemd-journal-sym \
@@ -5042,3 +5070,7 @@ tests += \
 
 cppcheck:
        cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+       @echo $($*)