From: Rémi Denis-Courmont <rem@videolan.org>
Date: Thu, 2 Mar 2006 07:52:53 +0000 (+0000)
Subject: libtool:
X-Git-Tag: 0.9.0-test0~12102
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8e3a102f3f6558cde8dd1d2ab450c9b472b47b9b;p=vlc

libtool:
 - Don't link builtins against anything (dependencies are linked in libvlc)
 - Don't mangle name of underlying libraries
---

diff --git a/bootstrap b/bootstrap
index e518371be0..ec93582231 100755
--- a/bootstrap
+++ b/bootstrap
@@ -441,7 +441,7 @@ lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
 lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` -static
 lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` -static
 lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` -static
-lib${mod}_builtin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs ${mod}\` -static
+lib${mod}_builtin_la_LDFLAGS = -static
 
 EOF
   done
diff --git a/src/Makefile.am b/src/Makefile.am
index 13be0f623d..2ff7226e59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,7 +165,7 @@ libvlc_la_SOURCES = $(SOURCES_libvlc)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /_builtin.la /g'` \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
 		-avoid-version -no-undefined
 libvlc_la_DEPENDENCIES = stamp-builtins