Changeset 262b957be023d4f84ebb1613e395dd11f4525a7f

Show
Ignore:
Timestamp:
28/02/06 16:12:37 (3 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1141139557 +0000
git-parent:

[ed07de3e8469dd5ada15d8aa9700d807e43e999c]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1141139557 +0000
Message:

With libtool, compile builtins as lib*_builtin.la to avoid name collision
with actual system library (seems to fix weird compilation problem with
flac and theora builtins)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    raf60367 r262b957  
    199199  do 
    200200    extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a lib${mod}_pic.a" 
    201     extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}.la" 
     201    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}_builtin.la" 
    202202  done 
    203203  rm -f "${makf}" && cat > "${makf}" << EOF 
    …… 
    239239    @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\ 
    240240    if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; fi; \\ 
    241     if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.la;; esac; done; fi; \\ 
     241    if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_builtin.la;; esac; done; fi; \\ 
    242242    \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\ 
    243243    test -z "\$\$fail" 
    …… 
    281281      p=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \ 
    282282      l=\$\$(\$(VLC_CONFIG) --list builtin); \ 
    283       s=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}.la" ;; esac; done\` ; \ 
     283      s=\`for mod in \$(mods); do case "\$\$l " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_builtin.la" ;; esac; done\` ; \ 
    284284      test -z "\$\$p\$\$s" || \ 
    285285        \$(MAKE) \$(AM_MAKEFLAGS) \ 
    …… 
    435435 
    436436lib${mod}_a_SOURCES = \$(SOURCES_${mod}) 
    437 lib${mod}_la_SOURCES = \$(SOURCES_${mod}) 
     437lib${mod}_builtin_la_SOURCES = \$(SOURCES_${mod}) 
    438438EOF 
    439439    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF 
    440440nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod}) 
    441 nodist_lib${mod}_la_SOURCES = \$(nodist_SOURCES_${mod}) 
     441nodist_lib${mod}_builtin_la_SOURCES = \$(nodist_SOURCES_${mod}) 
    442442EOF 
    443443    fi 
    …… 
    446446lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` 
    447447lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` 
    448 lib${mod}_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` 
    449 lib${mod}_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` 
    450 lib${mod}_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` 
    451 lib${mod}_la_LDFLAGS = \`\$(VLC_CONFIG) --libs ${mod}\` -static 
     448lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` -static 
     449lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` -static 
     450lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` -static 
     451lib${mod}_builtin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs ${mod}\` -static 
    452452 
    453453EOF 

  • src/Makefile.am

    r6a73573 r262b957  
    127127        esac ; \ 
    128128    done | \ 
    129     sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2.la/g' | \ 
     129    sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2_builtin.la/g' | \ 
    130130    while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done 
    131131endif 
    …… 
    160160libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` 
    161161libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` 
    162 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /.la /g'` \ 
     162libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /_builtin.la /g'` \ 
    163163        -avoid-version -no-undefined 
    164164libvlc_la_DEPENDENCIES = stamp-builtins