[pulseaudio-commits] src/Makefile.am

[Tanu Kaskinen]

 src/Makefile.am |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 56a1d3613d02d36869a22405e8bd0eaee93aa06a
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Sat Jan 11 16:47:56 2014 +0200

    build-sys: Fix building with --as-needed
    
    pulsecore/core-format.c was recently added to libpulsecommon, and
    core-format.c depends on functions in libpulse, which libpulsecommon
    doesn't link to. That broke building with --as-needed. This patch adds
    pulse/format.c to libpulsecommon, so that core-format.c doesn't need
    to depend on libpulse any more. format.c pulls in also the dependency
    to json-c.
    
    Reported-By: Jan Steffens <jan.steffens at gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 28049ea..83046a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -601,6 +601,7 @@ pkglib_LTLIBRARIES = \
 libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulse/client-conf.c pulse/client-conf.h \
 		pulse/fork-detect.c pulse/fork-detect.h \
+		pulse/format.c pulse/format.h \
 		pulse/xmalloc.c pulse/xmalloc.h \
 		pulse/proplist.c pulse/proplist.h \
 		pulse/utf8.c pulse/utf8.h \
@@ -676,9 +677,9 @@ else
 libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/poll-posix.c pulsecore/poll.h
 endif
 
-libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
+libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS)
 libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
-libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS)  $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
 
 if HAVE_X11
 libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES += \