summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-10-28 16:49:25 +0000
committerLennart Poettering <lennart@poettering.net>2007-10-28 16:49:25 +0000
commit9eb840cdee99ce4ecf835c00e32c62889ad4a561 (patch)
treedeffb242f2e0bfd85c0bc845cc9b00c4b6860578
parentd8976a21aadf7e998e995c5e5416a8ed3703557e (diff)
Merge r1503 from trunk: Make -no-undefined actually work (and fix up error found by it).
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1967 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index eee47191..28ed8699 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,7 @@ AM_LIBADD = $(PTHREAD_LIBS)
AM_LDADD = $(PTHREAD_LIBS)
# Only required on some platforms but defined for all to avoid errors
-AM_LDFLAGS = -no-undefined
+AM_LDFLAGS = -Wl,-no-undefined
if STATIC_BINS
BINLDFLAGS = -static
@@ -1271,7 +1271,7 @@ liboss_util_la_LIBADD = libpulsecore.la
module_oss_la_SOURCES = modules/module-oss.c
module_oss_la_LDFLAGS = -module -avoid-version
-module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
+module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la libpulsecore.la
# ALSA