From 8e3a102f3f6558cde8dd1d2ab450c9b472b47b9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 2 Mar 2006 07:52:53 +0000 Subject: [PATCH] libtool: - Don't link builtins against anything (dependencies are linked in libvlc) - Don't mangle name of underlying libraries --- bootstrap | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.39.2