Changeset 92ad9789e7928aa2ac8d3db53bbe8a48d31e7cd7

Show
Ignore:
Timestamp:
07/20/07 15:13:53 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1184937233 +0000
git-parent:

[88e31f14f1b5bc41d1f2be07e4623b52623b746a]

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

Clean up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    r14b5b5f r92ad978  
    222222LTLIBVLC = \$(top_builddir)/src/libvlc.la 
    223223 
     224AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\ 
     225    -module -no-undefined -shrext \$(LIBEXT) \\ 
     226    -export-symbol-regex ^\$(VLC_ENTRY)\$\$ 
     227 
    224228if USE_LIBTOOL 
    225 LIBADD = \$(LTLIBVLC) 
     229AM_LIBADD = \$(LTLIBVLC) 
    226230endif 
    227231if HAVE_WIN32 
    228232LIBVLC = \$(top_builddir)/src/libvlc.dll 
    229 LIBADD = \$(LIBVLC) 
    230233endif 
    231234 
    …… 
    253256_plugin.la_plugin\$(LIBEXT): 
    254257    @mod="\$*" ; mod=\$\${mod#lib} ; \ 
    255     ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \ 
     258    ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBVLC) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \ 
    256259    case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\ 
    257260      c++)  ld="\$(CXXLINK)" ;; \ 
    …… 
    350353lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` 
    351354lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` 
    352 lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\ 
    353     -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\ 
    354     -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined \$(LIBADD) 
     355lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \$(AM_LDFLAGS) 
     356lib${mod}_plugin_la_LIBADD = $\(AM_LIBADD) 
    355357EOF 
    356358  done