Changeset 130afa593b0bbcdf1144e933db500e7170d6abfa

Show
Ignore:
Timestamp:
07/19/07 19:28:35 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1184866115 +0000
git-parent:

[df78f0a87c59ef0486aaa8365b327e3f51edddb4]

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

Remove non-libtool targets.
automake could hardly keep up with 700 targets.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    r9b007c1 r130afa5  
    193193  subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`" 
    194194  mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`" 
    195   extra_libs="" 
    196195  extra_ltlibs="" 
    197196  for mod in $mods 
    198197  do 
    199     extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a" 
    200198    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la" 
    201199  done 
    …… 
    210208NULL = 
    211209libvlc_LTLIBRARIES = 
    212 noinst_LTLIBRARIES = 
    213210EXTRA_DIST = Modules.am 
    214211BUILT_SOURCES = 
    215 clean_modules = 
     212CLEANFILES = 
    216213SUBDIRS = ${subdirs} 
    217 SUFFIXES = _plugin\$(LIBEXT) _plugin.a 
     214SUFFIXES = _plugin\$(LIBEXT) _plugin.la 
    218215 
    219216libvlcdir = \$(libdir)/vlc/\$(basedir) 
    220217 
    221 EXTRA_LIBRARIES = ${extra_libs} 
    222218EXTRA_LTLIBRARIES = ${extra_ltlibs} 
    223219 
    …… 
    226222LTLIBVLC = \$(top_builddir)/src/libvlc.la 
    227223 
     224if USE_LIBTOOL 
     225LIBADD = \$(LTLIBVLC) 
     226endif 
    228227if HAVE_WIN32 
    229 LIBVLC = -L\$(top_builddir)/src -lvlc 
     228LIBVLC = \$(top_builddir)/src/libvlc.dll 
    230229LIBADD = \$(LIBVLC) 
    231230endif 
    …… 
    252251 
    253252# Build a plugin with the adequate linker and linker's flags 
    254 _plugin.a_plugin\$(LIBEXT): 
     253_plugin.la_plugin\$(LIBEXT): 
    255254    @mod="\$*" ; mod=\$\${mod#lib} ; \ 
    256255    ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \ 
    …… 
    262261    echo \$\$ld \$< \$\$ldfl ; \ 
    263262    \$\$ld \$< \$\$ldfl 
    264 #ifneq (,\$(findstring cygwin,\$(host))) 
    265 #   mv -f "\$@.exe" "\$@" 
    266 #endif 
    267     @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi 
     263    @if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi 
    268264 
    269265if MAINTAINER_MODE 
    …… 
    273269 
    274270mostlyclean-local: 
    275 if USE_LIBTOOL 
    276271    -rm -f *.la 
    277 else 
    278     -rm -f *.a *\$(LIBEXT) 
    279 endif 
    280  
    281 clean-local: \$(clean_modules) 
     272if !USE_LIBTOOL 
     273    -rm -f *\$(LIBEXT) 
     274endif 
    282275 
    283276### automake creates libvlcdir after running install-*-local 
    …… 
    344337 
    345338EOF 
     339    cat >> "${makf}" << EOF 
     340lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod}) 
     341EOF 
    346342    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF 
    347 clean_modules += clean-${mod} 
    348 clean-${mod}: 
    349     -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod}) 
    350  
    351 EOF 
    352     fi 
    353     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF 
     343nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod}) 
     344CLEANFILES += "\$(nodist_SOURCES_${mod})" 
    354345BUILT_SOURCES += \$(B${mod}) 
    355346EOF 
    356347    fi 
    357348    cat >> "${makf}" << EOF 
    358 lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) 
    359 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod}) 
    360 EOF 
    361     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF 
    362 nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) 
    363 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod}) 
    364 EOF 
    365     fi 
    366     cat >> "${makf}" << EOF 
    367 lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` 
    368 lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` 
    369 lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` 
    370349lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` 
    371350lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` 
    …… 
    374353    -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\ 
    375354    -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined 
    376 lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC) 
    377  
    378 lib${mod}_a_SOURCES = \$(SOURCES_${mod}) 
    379 EOF 
    380     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF 
    381 nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod}) 
    382 EOF 
    383     fi 
    384     cat >> "${makf}" << EOF 
    385 lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` 
    386 lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` 
    387 lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` 
    388  
    389355EOF 
    390356  done