chiark / gitweb /
bash: add completion for systemd-nspawn
[elogind.git] / Makefile.am
index c538e7c3193c5f7c148dc9228a6ee53b5f29bd5b..68698f1e929f967de28f16b49d4a2b170a7b529a 100644 (file)
@@ -39,28 +39,28 @@ LIBUDEV_CURRENT=5
 LIBUDEV_REVISION=0
 LIBUDEV_AGE=4
 
-LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=3
-LIBGUDEV_AGE=1
+LIBGUDEV_CURRENT=2
+LIBGUDEV_REVISION=0
+LIBGUDEV_AGE=2
 
 LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=11
+LIBSYSTEMD_DAEMON_REVISION=12
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=27
+LIBSYSTEMD_ID128_REVISION=28
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=4
+LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=1
 LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
@@ -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
@@ -196,6 +196,7 @@ AM_CPPFLAGS = \
        -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-network \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -353,6 +354,7 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/systemd-delta \
+       shell-completion/bash/systemd-nspawn \
        shell-completion/bash/systemd-run \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
@@ -502,9 +504,6 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-udevd.service \
-       units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \
        units/systemd-hybrid-sleep.service.in \
@@ -646,8 +645,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 += \
@@ -674,6 +672,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 \
@@ -763,14 +763,26 @@ libsystemd_shared_la_SOURCES = \
        src/shared/net-util.h \
        src/shared/errno-list.c \
        src/shared/errno-list.h \
+       src/shared/af-list.c \
+       src/shared/af-list.h \
        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 \
+       src/shared/bus-label.c \
+       src/shared/bus-label.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h
+       src/shared/errno-to-name.h \
+       src/shared/af-from-name.h \
+       src/shared/af-to-name.h
+
+libsystemd_shared_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -814,7 +826,6 @@ libsystemd_label_la_LIBADD = \
 # ------------------------------------------------------------------------------
 
 if HAVE_SECCOMP
-
 noinst_LTLIBRARIES += \
        libsystemd-seccomp.la
 
@@ -828,7 +839,6 @@ libsystemd_seccomp_la_CFLAGS = \
 
 libsystemd_seccomp_la_LIBADD = \
        $(SECCOMP_LIBS)
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -1016,6 +1026,7 @@ libsystemd_core_la_CFLAGS = \
        $(AUDIT_CFLAGS) \
        $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
+       $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
@@ -1031,6 +1042,7 @@ libsystemd_core_la_LIBADD = \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
        $(KMOD_LIBS) \
+       $(APPARMOR_LIBS) \
        $(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1050,11 +1062,15 @@ CLEANFILES += \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c \
        src/shared/errno-list.txt \
-       src/shared/errno-from-name.gperf
+       src/shared/errno-from-name.gperf \
+       src/shared/af-list.txt \
+       src/shared/af-from-name.gperf
 
 BUILT_SOURCES += \
        src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h
+       src/shared/errno-to-name.h \
+       src/shared/af-from-name.h \
+       src/shared/af-to-name.h
 
 src/shared/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1072,10 +1088,30 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
+src/shared/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-from-name.gperf: src/shared/af-list.txt
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct af_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@
+
+src/shared/af-from-name.h: src/shared/af-from-name.gperf
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_af -H hash_af_name -p -C < $< > $@
+
+src/shared/af-to-name.h: src/shared/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 "};"}' < $< > $@
+
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
        src/core/main.c
 
+systemd_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 systemd_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1148,7 +1184,8 @@ tests += \
        test-list \
        test-tables \
        test-device-nodes \
-       test-xml
+       test-xml \
+       test-architecture
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1172,6 +1209,10 @@ test_device_nodes_LDADD = \
 test_engine_SOURCES = \
        src/test/test-engine.c
 
+test_engine_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_engine_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1179,6 +1220,10 @@ test_engine_LDADD = \
 test_job_type_SOURCES = \
        src/test/test-job-type.c
 
+test_job_type_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_job_type_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1186,6 +1231,10 @@ test_job_type_LDADD = \
 test_ns_SOURCES = \
        src/test/test-ns.c
 
+test_ns_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_ns_LDADD = \
        libsystemd-core.la
 
@@ -1215,6 +1264,10 @@ endif
 test_unit_name_SOURCES = \
        src/test/test-unit-name.c
 
+test_unit_name_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_unit_name_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1222,6 +1275,10 @@ test_unit_name_LDADD = \
 test_unit_file_SOURCES = \
        src/test/test-unit-file.c
 
+test_unit_file_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_unit_file_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1272,6 +1329,10 @@ test_tables_SOURCES = \
        src/test/test-tables.c \
        src/shared/test-tables.h
 
+test_tables_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_tables_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
@@ -1296,6 +1357,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
 
@@ -1350,7 +1417,8 @@ test_cgroup_SOURCES = \
 
 test_cgroup_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
 
 test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
@@ -1359,6 +1427,10 @@ test_cgroup_mask_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
+test_cgroup_mask_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_cgroup_mask_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1409,8 +1481,8 @@ test_install_SOURCES = \
 test_install_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
 
 test_watchdog_SOURCES = \
        src/test/test-watchdog.c
@@ -1425,6 +1497,10 @@ test_sched_prio_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
+test_sched_prio_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_sched_prio_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
@@ -1726,6 +1802,9 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
        bootctl
 
+dist_bashcompletion_DATA += \
+       shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
 
@@ -1868,9 +1947,13 @@ systemd_nspawn_LDADD = \
        libsystemd-capability.la \
        libsystemd-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 = \
@@ -1997,6 +2080,9 @@ libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
+libsystemd_internal_la_LIBADD = \
+       $(RT_LIBS)
+
 noinst_LTLIBRARIES += \
        libsystemd-internal.la
 
@@ -2047,6 +2133,15 @@ libsystemd_la_LIBADD = \
        $(RT_LIBS) \
        -lresolv
 
+libsystemd-install-hook:
+       libname=libsystemd.so && $(move-to-rootlibdir)
+
+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
 
@@ -2133,6 +2228,10 @@ test_bus_chat_LDADD = \
 test_bus_cleanup_SOURCES = \
        src/libsystemd/sd-bus/test-bus-cleanup.c
 
+test_bus_cleanup_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 test_bus_cleanup_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
@@ -2255,8 +2354,8 @@ test_bus_introspect_SOURCES = \
        src/libsystemd/sd-bus/test-bus-introspect.c
 
 test_bus_introspect_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_event_SOURCES = \
        src/libsystemd/sd-event/test-event.c
@@ -2301,41 +2400,44 @@ busctl_CFLAGS = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-dhcp.la
+       libsystemd-network.la
 
-libsystemd_dhcp_la_SOURCES = \
+libsystemd_network_la_SOURCES = \
+       src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/sd-dhcp-client.c \
-       src/libsystemd-dhcp/dhcp-lease.h \
-       src/libsystemd-dhcp/dhcp-lease.c \
-       src/libsystemd-dhcp/dhcp-network.c \
-       src/libsystemd-dhcp/dhcp-option.c \
-       src/libsystemd-dhcp/dhcp-packet.c \
-       src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/dhcp-protocol.h
-
-libsystemd_dhcp_la_LIBADD = \
+       src/systemd/sd-dhcp-lease.h \
+       src/network/sd-network.c \
+       src/libsystemd-network/sd-dhcp-client.c \
+       src/libsystemd-network/dhcp-network.c \
+       src/libsystemd-network/dhcp-option.c \
+       src/libsystemd-network/dhcp-packet.c \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-lease-internal.h \
+       src/libsystemd-network/sd-dhcp-lease.c
+
+libsystemd_network_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
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/test-dhcp-option.c
 
 test_dhcp_option_LDADD = \
-       libsystemd-dhcp.la \
+       libsystemd-network.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
+       src/libsystemd-network/dhcp-protocol.h \
+       src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/test-dhcp-client.c
 
 test_dhcp_client_LDADD = \
-       libsystemd-dhcp.la \
+       libsystemd-network.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2433,7 +2535,8 @@ INSTALL_DIRS += \
        $(sysconfdir)/udev/hwdb.d
 
 dist_network_DATA = \
-       network/99-default.link
+       network/99-default.link \
+       network/80-container-host0.network
 
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
@@ -3119,8 +3222,20 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-journal-core.la
 
-# ------------------------------------------------------------------------------
+journal-install-hook:
+       -$(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/
+
+journal-uninstall-hook:
+       -rmdir $(DESTDIR)/var/log/journal/
+
+INSTALL_EXEC_HOOKS += journal-install-hook
+UNINSTALL_EXEC_HOOKS += journal-uninstall-hook
 
+# ------------------------------------------------------------------------------
 # Update catalog on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
 catalog-update-hook:
@@ -3899,8 +4014,16 @@ rootlibexec_PROGRAMS += \
        systemd-networkd
 
 systemd_networkd_SOURCES = \
+       src/network/networkd.c
+
+systemd_networkd_LDADD = \
+       libsystemd-networkd-core.la
+
+noinst_LTLIBRARIES += \
+       libsystemd-networkd-core.la
+
+libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd.h \
-       src/network/networkd.c \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-network.c \
@@ -3908,49 +4031,50 @@ systemd_networkd_SOURCES = \
        src/network/networkd-route.c \
        src/network/networkd-manager.c
 
-nodist_systemd_networkd_SOURCES = \
-       src/network/networkd-gperf.c
+nodist_libsystemd_networkd_core_la_SOURCES = \
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
-systemd_networkd_LDADD = \
+libsystemd_networkd_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-dhcp.la \
+       libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
 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
+
+rootlibexec_PROGRAMS += \
+       systemd-networkd-wait-online
+
+systemd_networkd_wait_online_SOURCES = \
+       src/network/networkd-wait-online.c
+
+systemd_networkd_wait_online_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-network.la
 
 test_network_SOURCES = \
-       src/network/test-network.c \
-       src/network/networkd.h \
-       src/network/networkd-link.c \
-       src/network/networkd-netdev.c \
-       src/network/networkd-network.c \
-       src/network/networkd-address.c \
-       src/network/networkd-route.c \
-       src/network/networkd-manager.c \
-       src/network/networkd-gperf.c
+       src/network/test-network.c
 
 test_network_LDADD = \
-       libudev-internal.la \
-       libsystemd-internal.la \
-       libsystemd-dhcp.la \
-       libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-networkd-core.la
 
 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
 
 # ------------------------------------------------------------------------------
@@ -4231,6 +4355,7 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
+       libsystemd-shared.la \
        libsystemd.la
 
 _daemon_la_SOURCES = \
@@ -4252,6 +4377,7 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
+       libsystemd-shared.la \
        libsystemd.la
 
 _reader_la_SOURCES = \
@@ -4272,8 +4398,8 @@ _reader_la_LDFLAGS = \
 
 _reader_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd.la
 
 login_la_SOURCES = \
        src/python-systemd/login.c \
@@ -4293,8 +4419,8 @@ login_la_LDFLAGS = \
 
 login_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd.la
 
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
@@ -4340,24 +4466,26 @@ clean-python:
 
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
-
 EXTRA_DIST += \
        src/compat-libs/linkwarning.h
 
-define generate-fake-lib
+libsystemd-%.c: src/compat-libs/libsystemd-%.sym
        $(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
+       $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@
+
+BUILT_SOURCES += \
+       libsystemd-journal.c \
+       libsystemd-login.c \
+       libsystemd-id128.c \
+       libsystemd-daemon.c
 
 libsystemd_journal_la_SOURCES = \
        libsystemd-journal.c \
        src/compat-libs/libsystemd-journal.sym
 
-libsystemd_journal_la_CFLAGS = \
+libsystemd_journal_la_CPPFLAGS = \
        $(AM_CFLAGS) \
-       -fvisibility=default \
-       -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
-       -fno-lto
+       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
 
 libsystemd_journal_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4365,17 +4493,17 @@ libsystemd_journal_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
-       libsystemd.la
+       libsystemd-journal-internal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 libsystemd_login_la_SOURCES = \
        libsystemd-login.c \
        src/compat-libs/libsystemd-login.sym
 
-libsystemd_login_la_CFLAGS = \
+libsystemd_login_la_CPPFLAGS = \
        $(AM_CFLAGS) \
-       -fvisibility=default \
-       -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
-       -fno-lto
+       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
 
 libsystemd_login_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4383,14 +4511,16 @@ libsystemd_login_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-       libsystemd.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 libsystemd_id128_la_SOURCES = \
        libsystemd-id128.c \
        src/compat-libs/libsystemd-id128.sym
 
-libsystemd_id128_la_CFLAGS = \
-       $(libsystemd_login_la_CFLAGS)
+libsystemd_id128_la_CPPFLAGS = \
+       $(AM_CFLAGS) \
+       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
 
 libsystemd_id128_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4398,14 +4528,16 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd.la
+       libsystemd-internal.la \
+       libsystemd-shared.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_CPPFLAGS = \
+       $(AM_CFLAGS) \
+       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
 
 libsystemd_daemon_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4413,16 +4545,8 @@ libsystemd_daemon_la_LDFLAGS = \
        -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-daemon.c
-
-libsystemd-%.c: src/compat-libs/libsystemd-%.sym
-       $(generate-fake-lib)
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la \
@@ -4431,6 +4555,7 @@ lib_LTLIBRARIES += \
        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-daemon.pc
@@ -4438,20 +4563,22 @@ pkgconfiglib_DATA += \
 # 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-journal.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-journal.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
-
 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-daemon.pc.in
@@ -4876,7 +5003,6 @@ EXTRA_DIST += \
        $(top_srcdir)/tools/check-includes.pl
 
 # Stupid test that everything purported to be exported really is
-
 define generate-sym-test
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_at)printf '#include <stdio.h>\n' > $@
@@ -4981,3 +5107,6 @@ cppcheck:
 # Used to extract compile flags for YCM.
 print-%:
        @echo $($*)
+
+git-contrib:
+       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u