chiark / gitweb /
Makefile: fix build on clang
[elogind.git] / Makefile.am
index e9fca3f..0b879f1 100644 (file)
@@ -48,7 +48,7 @@ LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=10
+LIBSYSTEMD_DAEMON_REVISION=11
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
@@ -56,7 +56,7 @@ LIBSYSTEMD_ID128_REVISION=27
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_REVISION=4
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
@@ -87,7 +87,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-networkdir=$(prefix)/lib/systemd/network
+networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -348,6 +348,7 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
+       shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
@@ -645,8 +646,7 @@ EXTRA_DIST += \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/make-man-rules.py \
-       tools/xml_helper.py \
-       man/less-variables.xml
+       tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -673,6 +673,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/util.h \
        src/shared/virt.c \
        src/shared/virt.h \
+       src/shared/architecture.c \
+       src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
        src/shared/path-util.c \
@@ -765,7 +767,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
-       src/shared/xml.h
+       src/shared/xml.h \
+       src/shared/condition-util.c \
+       src/shared/condition-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1015,6 +1019,7 @@ libsystemd_core_la_CFLAGS = \
        $(AUDIT_CFLAGS) \
        $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
+       $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
@@ -1022,7 +1027,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
        libsystemd-internal.la \
@@ -1031,6 +1035,7 @@ libsystemd_core_la_LIBADD = \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
        $(KMOD_LIBS) \
+       $(APPARMOR_LIBS) \
        $(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1148,7 +1153,8 @@ tests += \
        test-list \
        test-tables \
        test-device-nodes \
-       test-xml
+       test-xml \
+       test-architecture
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1296,6 +1302,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
        libsystemd-core.la
 
+test_architecture_SOURCES = \
+       src/test/test-architecture.c
+
+test_architecture_LDADD = \
+       libsystemd-shared.la
+
 test_log_SOURCES = \
        src/test/test-log.c
 
@@ -1342,7 +1354,7 @@ test_daemon_SOURCES = \
        src/test/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 test_cgroup_SOURCES = \
@@ -1368,7 +1380,7 @@ test_cgroup_util_SOURCES = \
 
 test_cgroup_util_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 test_env_replace_SOURCES = \
@@ -1473,7 +1485,6 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1482,7 +1493,6 @@ systemd_initctl_SOURCES = \
 
 systemd_initctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1495,7 +1505,6 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(AUDIT_LIBS)
 
@@ -1505,7 +1514,7 @@ systemd_shutdownd_SOURCES = \
 
 systemd_shutdownd_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 dist_doc_DATA += \
@@ -1646,7 +1655,6 @@ systemd_fsck_SOURCES = \
 
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -1725,12 +1733,14 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-internal.la \
-       libsystemd-daemon-internal.la
+       libsystemd-internal.la
 
 bin_PROGRAMS += \
        bootctl
 
+dist_bashcompletion_DATA += \
+       shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
 
@@ -1804,7 +1814,6 @@ systemd_cgroups_agent_SOURCES = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1817,7 +1826,6 @@ systemctl_LDADD = \
        libsystemd-internal.la \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1826,7 +1834,7 @@ systemd_notify_SOURCES = \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1874,11 +1882,14 @@ systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
+       libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
        libsystemd-seccomp.la \
        $(SECCOMP_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1888,7 +1899,6 @@ systemd_run_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1897,7 +1907,6 @@ systemd_bus_proxyd_SOURCES = \
 
 systemd_bus_proxyd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bus-proxyd-install-hook:
@@ -1934,58 +1943,7 @@ systemd_tty_ask_password_agent_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
-       src/libsystemd-daemon/libsystemd-daemon.sym \
-       src/libsystemd-daemon/sd-daemon.c
-
-libsystemd_daemon_internal_la_SOURCES = \
-       $(libsystemd_daemon_la_SOURCES)
-
-libsystemd_daemon_internal_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DSD_DAEMON_DISABLE_MQ
-
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
-
-libsystemd_daemon_la_LIBADD =  \
-       $(RT_LIBS)
-
-pkginclude_HEADERS += \
-       src/systemd/sd-daemon.h
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
-
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
-
-lib_LTLIBRARIES += \
-       libsystemd-daemon.la
-
-noinst_LTLIBRARIES += \
-       libsystemd-daemon-internal.la
-
-pkgconfiglib_DATA += \
-       src/libsystemd-daemon/libsystemd-daemon.pc
-
-EXTRA_DIST += \
-       src/libsystemd-daemon/libsystemd-daemon.pc.in
-
-# ------------------------------------------------------------------------------
-libsystemd_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
+libsystemd_internal_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
@@ -1996,6 +1954,7 @@ libsystemd_la_SOURCES = \
        src/systemd/sd-resolve.h \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
+       src/systemd/sd-daemon.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2044,68 +2003,108 @@ libsystemd_la_SOURCES = \
        src/libsystemd/sd-resolve/sd-resolve.c \
        src/libsystemd/sd-resolve/resolve-util.h \
        src/libsystemd/sd-id128/sd-id128.c \
+       src/libsystemd/sd-daemon/sd-daemon.c \
        src/login/sd-login.c \
        src/login/login-shared.c \
        src/login/login-shared.h
 
-nodist_libsystemd_la_SOURCES = \
+nodist_libsystemd_internal_la_SOURCES = \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
-libsystemd_la_LIBADD = \
-       libsystemd-daemon-internal.la \
-       libsystemd-shared.la \
-       -lresolv
-
-libsystemd_la_CFLAGS = \
+libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
-libsystemd_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+libsystemd_internal_la_LIBADD = \
+       $(RT_LIBS)
 
-pkgconfiglib_DATA += \
-       src/libsystemd/libsystemd.pc
+noinst_LTLIBRARIES += \
+       libsystemd-internal.la
 
-pkginclude_HEADERS += \
-       src/systemd/sd-login.h \
-       src/systemd/sd-id128.h
+libsystemd_dump_la_SOURCES = \
+       src/libsystemd/sd-bus/bus-dump.c \
+       src/libsystemd/sd-bus/bus-dump.h
+
+libsystemd_dump_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
+
+noinst_LTLIBRARIES += \
+       libsystemd-dump.la
 
 EXTRA_DIST += \
+       src/libsystemd/libsystemd.sym.m4 \
+       src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
-       src/libsystemd/libsystemd.pc.in
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
-lib_LTLIBRARIES += \
-       libsystemd.la
+BUILT_SOURCES += \
+       src/libsystemd/libsystemd.sym
 
-libsystemd_internal_la_SOURCES = \
-       $(libsystemd_la_SOURCES)
+libsystemd_la_SOURCES = \
+       $(libsystemd_internal_la_SOURCES) \
+       $(libsystemd_journal_internal_la_SOURCES)
 
-nodist_libsystemd_internal_la_SOURCES = \
-       $(nodist_libsystemd_la_SOURCES)
+nodist_libsystemd_la_SOURCES = \
+       $(nodist_libsystemd_internal_la_SOURCES)
 
-libsystemd_internal_la_CFLAGS = \
-       $(libsystemd_la_CFLAGS)
+libsystemd_la_CFLAGS = \
+       $(libsystemd_internal_la_CFLAGS) \
+       $(libsystemd_journal_internal_la_CFLAGS)
 
-noinst_LTLIBRARIES += \
-       libsystemd-internal.la
+libsystemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
 
-libsystemd_dump_la_SOURCES = \
-       src/libsystemd/sd-bus/bus-dump.c \
-       src/libsystemd/sd-bus/bus-dump.h
+libsystemd_la_LIBADD = \
+       libsystemd-shared.la \
+       $(libsystemd_journal_internal_la_LIBADD) \
+       $(RT_LIBS) \
+       -lresolv
 
-libsystemd_dump_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+libsystemd-install-hook:
+       libname=libsystemd.so && $(move-to-rootlibdir)
+       -$(MKDIR_P) $(DESTDIR)/var/log/journal
+       -chown 0:0 $(DESTDIR)/var/log/journal
+       -chmod 755 $(DESTDIR)/var/log/journal
+       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
 
-noinst_LTLIBRARIES += \
-       libsystemd-dump.la
+libsystemd-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
+pkgconfiglib_DATA += \
+       src/libsystemd/libsystemd.pc
+
+pkginclude_HEADERS += \
+       src/systemd/sd-login.h \
+       src/systemd/sd-id128.h \
+       src/systemd/sd-daemon.h
+
+if ENABLE_KDBUS
+pkginclude_HEADERS += \
+       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/systemd/sd-rtnl.h \
+       src/systemd/sd-resolve.h
+endif
+
+lib_LTLIBRARIES += \
+       libsystemd.la
 
 tests += \
        test-bus-marshal \
@@ -2136,7 +2135,6 @@ test_bus_marshal_SOURCES = \
 
 test_bus_marshal_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2166,7 +2164,6 @@ test_bus_chat_CFLAGS = \
 
 test_bus_chat_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_cleanup_SOURCES = \
@@ -2174,7 +2171,6 @@ test_bus_cleanup_SOURCES = \
 
 test_bus_cleanup_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_server_SOURCES = \
@@ -2186,7 +2182,6 @@ test_bus_server_CFLAGS = \
 
 test_bus_server_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
@@ -2199,7 +2194,6 @@ test_bus_objects_CFLAGS = \
 
 test_bus_objects_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2210,7 +2204,6 @@ test_bus_error_SOURCES = \
 
 test_bus_error_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
@@ -2218,7 +2211,6 @@ test_bus_gvariant_SOURCES = \
 
 test_bus_gvariant_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2235,7 +2227,6 @@ test_bus_creds_SOURCES = \
 
 test_bus_creds_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la
@@ -2245,7 +2236,6 @@ test_bus_match_SOURCES = \
 
 test_bus_match_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
@@ -2253,7 +2243,6 @@ test_bus_kernel_SOURCES = \
 
 test_bus_kernel_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2268,7 +2257,6 @@ test_bus_kernel_bloom_SOURCES = \
 
 test_bus_kernel_bloom_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_benchmark_SOURCES = \
@@ -2276,7 +2264,6 @@ test_bus_kernel_benchmark_SOURCES = \
 
 test_bus_kernel_benchmark_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_memfd_SOURCES = \
@@ -2291,7 +2278,6 @@ test_bus_zero_copy_SOURCES = \
 
 test_bus_zero_copy_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2313,7 +2299,6 @@ test_event_SOURCES = \
 
 test_event_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_rtnl_SOURCES = \
@@ -2321,7 +2306,6 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_resolve_SOURCES = \
@@ -2342,7 +2326,6 @@ busctl_SOURCES = \
 
 busctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2390,7 +2373,6 @@ test_dhcp_client_SOURCES = \
 test_dhcp_client_LDADD = \
        libsystemd-dhcp.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -2436,7 +2418,7 @@ libudev_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 pkgconfiglib_DATA += \
@@ -2517,6 +2499,7 @@ dist_udevhwdb_DATA = \
        hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
+       hwdb/20-net-ifname.hwdb \
        hwdb/60-keyboard.hwdb
 
 udevconfdir = $(sysconfdir)/udev
@@ -2619,7 +2602,6 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
@@ -2997,7 +2979,6 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -3013,7 +2994,7 @@ systemd_activate_SOURCES = \
 
 systemd_activate_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3138,68 +3119,6 @@ test_catalog_CPPFLAGS = \
 test_catalog_LDADD = \
        libsystemd-journal-core.la
 
-libsystemd_journal_la_SOURCES = \
-       src/journal/libsystemd-journal.sym \
-       src/journal/sd-journal.c \
-       src/systemd/sd-journal.h \
-       src/systemd/_sd-common.h \
-       src/journal/journal-file.c \
-       src/journal/journal-file.h \
-       src/journal/journal-vacuum.c \
-       src/journal/journal-vacuum.h \
-       src/journal/journal-verify.c \
-       src/journal/journal-verify.h \
-       src/journal/lookup3.c \
-       src/journal/lookup3.h \
-       src/journal/journal-send.c \
-       src/journal/journal-def.h \
-       src/journal/compress.h \
-       src/journal/catalog.c \
-       src/journal/catalog.h \
-       src/journal/mmap-cache.c \
-       src/journal/mmap-cache.h
-
-libsystemd_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = \
-       libsystemd-label.la \
-       libsystemd-daemon-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
-libsystemd_journal_internal_la_SOURCES = \
-       $(libsystemd_journal_la_SOURCES)
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
-       $(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
-       src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
-       $(XZ_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-       $(XZ_LIBS)
-endif
-
 libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-kmsg.c \
        src/journal/journald-kmsg.h \
@@ -3225,7 +3144,6 @@ libsystemd_journal_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-capability.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -3237,45 +3155,6 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-journal-core.la
 
-if HAVE_GCRYPT
-libsystemd_journal_la_SOURCES += \
-       src/journal/journal-authenticate.c \
-       src/journal/journal-authenticate.h \
-       src/journal/fsprg.c \
-       src/journal/fsprg.h
-
-libsystemd_journal_la_CFLAGS += \
-       $(GCRYPT_CFLAGS) \
-       -Wno-pointer-arith
-
-libsystemd_journal_la_LIBADD += \
-       $(GCRYPT_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
-       $(GCRYPT_CFLAGS) \
-       -Wno-pointer-arith
-
-libsystemd_journal_internal_la_LIBADD += \
-       $(GCRYPT_LIBS)
-endif
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if
-# needed. Also, grant read access to new journal files to members of
-# "adm" and "wheel".
-libsystemd-journal-install-hook:
-       libname=libsystemd-journal.so && $(move-to-rootlibdir)
-       -$(MKDIR_P) $(DESTDIR)/var/log/journal
-       -chown 0:0 $(DESTDIR)/var/log/journal
-       -chmod 755 $(DESTDIR)/var/log/journal
-       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-
-libsystemd-journal-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
-
 # ------------------------------------------------------------------------------
 
 # Update catalog on installation. Do not bother if installing
@@ -3313,8 +3192,58 @@ pkginclude_HEADERS += \
        src/systemd/sd-messages.h \
        src/systemd/_sd-common.h
 
-lib_LTLIBRARIES += \
-       libsystemd-journal.la
+libsystemd_journal_internal_la_SOURCES = \
+       src/journal/sd-journal.c \
+       src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
+       src/journal/journal-file.c \
+       src/journal/journal-file.h \
+       src/journal/journal-vacuum.c \
+       src/journal/journal-vacuum.h \
+       src/journal/journal-verify.c \
+       src/journal/journal-verify.h \
+       src/journal/lookup3.c \
+       src/journal/lookup3.h \
+       src/journal/journal-send.c \
+       src/journal/journal-def.h \
+       src/journal/compress.h \
+       src/journal/catalog.c \
+       src/journal/catalog.h \
+       src/journal/mmap-cache.c \
+       src/journal/mmap-cache.h
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS =
+       $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+if HAVE_XZ
+libsystemd_journal_internal_la_SOURCES += \
+       src/journal/compress.c
+
+libsystemd_journal_internal_la_CFLAGS += \
+       $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(XZ_LIBS)
+endif
+
+if HAVE_GCRYPT
+libsystemd_journal_internal_la_SOURCES += \
+       src/journal/journal-authenticate.c \
+       src/journal/journal-authenticate.h \
+       src/journal/fsprg.c \
+       src/journal/fsprg.h
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(GCRYPT_LIBS)
+
+# fsprg.c is a drop-in file using void pointer arithmetic
+libsystemd_journal_internal_la_CFLAGS += \
+       $(GCRYPT_CFLAGS) \
+       -Wno-pointer-arith
+endif
 
 noinst_LTLIBRARIES += \
        libsystemd-journal-internal.la
@@ -3338,9 +3267,6 @@ nodist_systemunit_DATA += \
 dist_pkgsysconf_DATA += \
        src/journal/journald.conf
 
-pkgconfiglib_DATA += \
-       src/journal/libsystemd-journal.pc
-
 dist_catalog_DATA = \
        catalog/systemd.fr.catalog \
        catalog/systemd.ru.catalog \
@@ -3354,7 +3280,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-journal-flush.service
 
 EXTRA_DIST += \
-       src/journal/libsystemd-journal.pc.in \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
@@ -3377,7 +3302,6 @@ systemd_journal_gatewayd_SOURCES = \
 systemd_journal_gatewayd_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
@@ -3413,7 +3337,6 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3520,7 +3443,7 @@ systemd_readahead_SOURCES = \
        src/readahead/readahead-common.h
 
 systemd_readahead_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -3696,7 +3619,6 @@ systemd_hostnamed_SOURCES = \
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3728,7 +3650,6 @@ hostnamectl_SOURCES = \
 
 hostnamectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3755,7 +3676,6 @@ systemd_bus_driverd_SOURCES = \
 
 systemd_bus_driverd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3792,7 +3712,6 @@ systemd_localed_SOURCES = \
 systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -3833,7 +3752,6 @@ localectl_SOURCES = \
 
 localectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3863,7 +3781,6 @@ systemd_timedated_SOURCES = \
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3899,7 +3816,6 @@ timedatectl_SOURCES = \
 
 timedatectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3957,7 +3873,6 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -3970,7 +3885,6 @@ machinectl_SOURCES = \
 
 machinectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -4031,11 +3945,11 @@ systemd_networkd_SOURCES = \
        src/network/networkd-manager.c
 
 nodist_systemd_networkd_SOURCES = \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
        libsystemd-label.la \
@@ -4044,8 +3958,8 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
        units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-       systemd-networkd.service
+GENERAL_ALIASES += \
+       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
 test_network_SOURCES = \
        src/network/test-network.c \
@@ -4056,13 +3970,13 @@ test_network_SOURCES = \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 test_network_LDADD = \
        libudev-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
-       libsystemd-daemon-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -4070,11 +3984,13 @@ tests += \
        test-network
 
 EXTRA_DIST += \
-       src/network/networkd-gperf.gperf \
+       src/network/networkd-network-gperf.gperf \
+       src/network/networkd-netdev-gperf.gperf \
        units/systemd-networkd.service.in
 
 CLEANFILES += \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------
@@ -4118,7 +4034,6 @@ libsystemd_logind_core_la_SOURCES = \
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -4151,8 +4066,7 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        loginctl
@@ -4169,7 +4083,6 @@ systemd_inhibit_SOURCES = \
 
 systemd_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -4194,7 +4107,6 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_login_tables_SOURCES = \
@@ -4231,7 +4143,6 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(PAM_LIBS)
 
@@ -4338,7 +4249,7 @@ _journal_la_LDFLAGS = \
 
 _journal_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la
+       libsystemd.la
 
 id128_la_SOURCES = \
        src/python-systemd/id128.c \
@@ -4360,7 +4271,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _daemon_la_SOURCES = \
        src/python-systemd/_daemon.c \
@@ -4381,7 +4293,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-daemon.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \
@@ -4401,9 +4314,7 @@ _reader_la_LDFLAGS = \
 
 _reader_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la \
        libsystemd.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 login_la_SOURCES = \
@@ -4424,9 +4335,7 @@ login_la_LDFLAGS = \
 
 login_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la \
        libsystemd.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 dist_pkgpyexec_PYTHON = \
@@ -4474,11 +4383,32 @@ clean-python:
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
 
+EXTRA_DIST += \
+       src/compat-libs/linkwarning.h
+
 define generate-fake-lib
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
 endef
 
+libsystemd_journal_la_SOURCES = \
+       libsystemd-journal.c \
+       src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default \
+       -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
+       -fno-lto
+
+libsystemd_journal_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+       libsystemd.la
+
 libsystemd_login_la_SOURCES = \
        libsystemd-login.c \
        src/compat-libs/libsystemd-login.sym
@@ -4512,29 +4442,52 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd.la
 
+libsystemd_daemon_la_SOURCES = \
+       libsystemd-daemon.c \
+       src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_CFLAGS = \
+       $(libsystemd_login_la_CFLAGS)
+
+libsystemd_daemon_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_LIBADD = \
+       libsystemd.la
+
 BUILT_SOURCES += \
+       libsystemd-journal.c \
        libsystemd-login.c \
-       libsystemd-id128.c
+       libsystemd-id128.c \
+       libsystemd-daemon.c
 
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
        $(generate-fake-lib)
 
 lib_LTLIBRARIES += \
+       libsystemd-journal.la \
        libsystemd-login.la \
-       libsystemd-id128.la
+       libsystemd-id128.la \
+       libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
+       src/compat-libs/libsystemd-journal.pc \
        src/compat-libs/libsystemd-login.pc \
-       src/compat-libs/libsystemd-id128.pc
+       src/compat-libs/libsystemd-id128.pc \
+       src/compat-libs/libsystemd-daemon.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 compat-lib-install-hook:
        libname=libsystemd-login.so && $(move-to-rootlibdir)
        libname=libsystemd-id128.so && $(move-to-rootlibdir)
+       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
 
 compat-lib-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
 INSTALL_EXEC_HOOKS += compat-lib-install-hook
 UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
@@ -4542,8 +4495,10 @@ UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
 endif
 
 EXTRA_DIST += \
+       src/compat-libs/libsystemd-journal.pc.in \
        src/compat-libs/libsystemd-login.pc.in \
-       src/compat-libs/libsystemd-id128.pc.in
+       src/compat-libs/libsystemd-id128.pc.in \
+       src/compat-libs/libsystemd-daemon.pc.in
 
 # ------------------------------------------------------------------------------
 substitutions = \
@@ -4854,7 +4809,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
        --disable-split-usr \
-       --enable-kdbus
+       --enable-kdbus \
+       --enable-compat-libs
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4977,42 +4933,58 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-       src/libsystemd/libsystemd.sym \
-       src/systemd/sd-bus.h \
-       src/systemd/sd-utf8.h \
-       src/systemd/sd-login.h
+               $(top_builddir)/src/libsystemd/libsystemd.sym \
+               src/systemd/sd-journal.h \
+               src/systemd/sd-daemon.h \
+               src/systemd/sd-login.h \
+               src/systemd/sd-bus.h \
+               src/systemd/sd-utf8.h
+       $(generate-sym-test)
+
+test-libudev-sym.c: \
+               src/libudev/libudev.sym \
+               src/udev/udev.h
        $(generate-sym-test)
 
+test_libsystemd_sym_SOURCES = \
+       test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+       libsystemd.la
+
+test_libudev_sym_SOURCES = \
+       test-libudev-sym.c
+test_libudev_sym_LDADD = \
+       libudev.la
+
+BUILT_SOURCES += \
+       $(test_libsystemd_sym_SOURCES) \
+       $(test_libudev_sym_SOURCES)
+
+tests += \
+       test-libsystemd-sym \
+       test-libudev-sym
+
+if ENABLE_COMPAT_LIBS
 test-libsystemd-daemon-sym.c: \
-       src/libsystemd-daemon/libsystemd-daemon.sym \
-       src/systemd/sd-daemon.h
+               src/compat-libs/libsystemd-daemon.sym \
+               src/systemd/sd-daemon.h
        $(generate-sym-test)
 
 test-libsystemd-id128-sym.c: \
-       src/compat-libs/libsystemd-id128.sym \
-       src/systemd/sd-id128.h
+               src/compat-libs/libsystemd-id128.sym \
+               src/systemd/sd-id128.h
        $(generate-sym-test)
 
 test-libsystemd-journal-sym.c: \
-       src/journal/libsystemd-journal.sym \
-       src/systemd/sd-journal.h
+               src/compat-libs/libsystemd-journal.sym \
+               src/systemd/sd-journal.h
        $(generate-sym-test)
 
 test-libsystemd-login-sym.c: \
-       src/compat-libs/libsystemd-login.sym \
-       src/systemd/sd-login.h
-       $(generate-sym-test)
-
-test-libudev-sym.c: \
-       src/libudev/libudev.sym \
-       src/udev/udev.h
+               src/compat-libs/libsystemd-login.sym \
+               src/systemd/sd-login.h
        $(generate-sym-test)
 
-test_libsystemd_sym_SOURCES = \
-       test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
-       libsystemd.la
-
 test_libsystemd_daemon_sym_SOURCES = \
        test-libsystemd-daemon-sym.c
 test_libsystemd_daemon_sym_LDADD = \
@@ -5033,31 +5005,17 @@ test_libsystemd_login_sym_SOURCES = \
 test_libsystemd_login_sym_LDADD = \
        libsystemd-login.la
 
-test_libudev_sym_SOURCES = \
-       test-libudev-sym.c
-test_libudev_sym_LDADD = \
-       libudev.la
-
 BUILT_SOURCES += \
-       $(test_libsystemd_sym_SOURCES) \
-       $(test_libsystemd_daemon_sym_SOURCES) \
        $(test_libsystemd_journal_sym_SOURCES) \
-       $(test_libudev_sym_SOURCES)
-
-tests += \
-       test-libsystemd-sym \
-       test-libsystemd-daemon-sym \
-       test-libsystemd-journal-sym \
-       test-libudev-sym
-
-if ENABLE_COMPAT_LIBS
-BUILT_SOURCES += \
        $(test_libsystemd_login_sym_SOURCES) \
-       $(test_libsystemd_id128_sym_SOURCES)
+       $(test_libsystemd_id128_sym_SOURCES) \
+       $(test_libsystemd_daemon_sym_SOURCES)
 
 tests += \
+       test-libsystemd-journal-sym \
        test-libsystemd-login-sym \
-       test-libsystemd-id128-sym
+       test-libsystemd-id128-sym \
+       test-libsystemd-daemon-sym
 endif
 
 .PHONY: cppcheck