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 e518371be0457aec41dc6519a731cfa7a4ac018e..ec9358223177fcf01d24241baa65253bdc650c02 100755 (executable)
--- 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 13be0f623d7fb4a78312fdb66208c4ae9f43f34c..2ff7226e59dc29456581c22a945e9ec4c7d313bc 100644 (file)
--- 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