summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2012-03-12 09:05:52 +0200
committerTanu Kaskinen <tanuk@iki.fi>2012-03-12 09:05:52 +0200
commitbbc600aae9066ece6ed7802319669e3d00bdc095 (patch)
tree2ea04a703dabd91a02dd2b9363b791f6e5b2867b
parent50a7bf1175eaf07521c00bde8eed2f820e64437f (diff)
Revert "build-sys: Remove the public API stuff from libpulsecommon."
This reverts commit 24ff7196753a3273bac34e87bdcf42384f974d45. If these files aren't compiled in both libpulse and libpulsecommon, some things will try use non-public functions from libpulse. Therefore those internal functions have to be included directly in libpulsecommon. This problem appears to be only visible with --as-needed, which is why the problem wasn't noticed immediately. The problem has existed also earlier, and it was fixed by Maarten Bosmans in commit 2de2c735. The commit that is now reverted basically reverted Maarten's commit (I didn't know that when I wrote the bad patch).
-rw-r--r--src/Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 532770d5..034981c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -536,6 +536,14 @@ pkglib_LTLIBRARIES = \
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
pulse/client-conf.c pulse/client-conf.h \
pulse/fork-detect.c pulse/fork-detect.h \
+ pulse/xmalloc.c pulse/xmalloc.h \
+ pulse/proplist.c pulse/proplist.h \
+ pulse/utf8.c pulse/utf8.h \
+ pulse/channelmap.c pulse/channelmap.h \
+ pulse/sample.c pulse/sample.h \
+ pulse/util.c pulse/util.h \
+ pulse/timeval.c pulse/timeval.h \
+ pulse/rtclock.c pulse/rtclock.h \
pulsecore/atomic.h \
pulsecore/authkey.c pulsecore/authkey.h \
pulsecore/conf-parser.c pulsecore/conf-parser.h \