build-sys: Make libsystemd-shared link to libsystemd-daemon

Commit f934051c4d17d167bd8e46dd3c70a745e26fd2eb broke the build
because it made libsystemd-shared call sd_listen_fds() which is
defined in libsystemd-daemon.

This is a bit of a contortion because libsystemd-shared.la is a
noinst_LTLIBRARY, but libtool should do the right thing here and emit
DT_NEEDED on libsystemd-daemon.so for things that consume
libsystemd-shared.la.

diff --git a/Makefile.am b/Makefile.am
index 165b85deae79a3880811126e1f0774ca6d860946..163a180dc4a086f1c80f6fc2aa06ad01de7ca539 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -849,6 +849,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/calendarspec.c \
        src/shared/calendarspec.h
 
        src/shared/calendarspec.c \
        src/shared/calendarspec.h
 

+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+

 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-dbus.la
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-dbus.la