[systemd-commits] Makefile.am

[Kay Sievers]

 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 81dc4bde12acd0a59ad96a505dbb109a9e4f320e
Author: Colin Walters <walters at verbum.org>
Date:   Sun Dec 23 10:18:21 2012 -0500

    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 165b85d..163a180 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -849,6 +849,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/calendarspec.c \
 	src/shared/calendarspec.h
 
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-dbus.la