Remove non-libtool targets.

automake could hardly keep up with 700 targets.

diff --git a/bootstrap b/bootstrap
index 817f370329482f623bf7e8474c033a967f77ba8c..c5f40ab37558d51a0c4d17e31ba47062216d5526 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -192,11 +192,9 @@ do
   # automake will not recurse for make dist if we don't define SUBDIRS = .
   subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
   mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
-  extra_libs=""
   extra_ltlibs=""
   for mod in $mods
   do
-    extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a"
     extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
   done
   rm -f "${makf}" && cat > "${makf}" << EOF
@@ -209,24 +207,25 @@ mods = ${mods}
 
 NULL =
 libvlc_LTLIBRARIES =
-noinst_LTLIBRARIES =
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
-clean_modules =
+CLEANFILES =
 SUBDIRS = ${subdirs}
-SUFFIXES = _plugin\$(LIBEXT) _plugin.a
+SUFFIXES = _plugin\$(LIBEXT) _plugin.la
 
 libvlcdir = \$(libdir)/vlc/\$(basedir)
 
-EXTRA_LIBRARIES = ${extra_libs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include Modules.am
 
 LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
+if USE_LIBTOOL
+LIBADD = \$(LTLIBVLC)
+endif
 if HAVE_WIN32
-LIBVLC = -L\$(top_builddir)/src -lvlc
+LIBVLC = \$(top_builddir)/src/libvlc.dll
 LIBADD = \$(LIBVLC)
 endif
 
@@ -251,7 +250,7 @@ else
 endif
 
 # Build a plugin with the adequate linker and linker's flags
-_plugin.a_plugin\$(LIBEXT):
+_plugin.la_plugin\$(LIBEXT):
        @mod="\$*" ; mod=\$\${mod#lib} ; \
        ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
        case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
@@ -261,10 +260,7 @@ _plugin.a_plugin\$(LIBEXT):
        esac ; \
        echo \$\$ld \$< \$\$ldfl ; \
        \$\$ld \$< \$\$ldfl
-#ifneq (,\$(findstring cygwin,\$(host)))
-#      mv -f "\$@.exe" "\$@"
-#endif
-       @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi
+       @if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
@@ -272,14 +268,11 @@ if MAINTAINER_MODE
 endif
 
 mostlyclean-local:
-if USE_LIBTOOL
        -rm -f *.la
-else
-       -rm -f *.a *\$(LIBEXT)
+if !USE_LIBTOOL
+       -rm -f *\$(LIBEXT)
 endif
 
-clean-local: \$(clean_modules)
-
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules
@@ -343,49 +336,22 @@ EOF
 # The ${mod} plugin
 
 EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-clean_modules += clean-${mod}
-clean-${mod}:
-       -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
-
-EOF
-    fi
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-BUILT_SOURCES += \$(B${mod})
-EOF
-    fi
     cat >> "${makf}" << EOF
-lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
+CLEANFILES += "\$(nodist_SOURCES_${mod})"
+BUILT_SOURCES += \$(B${mod})
 EOF
     fi
     cat >> "${makf}" << EOF
-lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
-lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
-lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
 lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
 lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
 lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\
        -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\
        -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined
-lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
-
-lib${mod}_a_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
-lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
-lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
-
 EOF
   done
 done