Changeset 29d8ffc9beea30a6344f4e642779bcb20eac616b

Timestamp:

10/19/06 21:29:46 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1161286186 +0000

git-parent:

[40356097fea4dba1e8d8d22dc3d62f86337b291e]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1161286186 +0000

Message:

Oh! No more builtins!
(well only for libtool and shared libvlc)

Clean your build tree before whining.

And yes, it breaks the mostly-builtin option (obviously).
It also speeds up automake a tiny bit.

Files:

• bootstrap (modified) (8 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (3 diffs)

bootstrap

@@ -200 +200 @@
-  do
-    extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a"
- lib${mod}_builtin.la
+
-  done
-  rm -f "${makf}" && cat > "${makf}" << EOF
@@ -242 +242 @@
-if USE_LIBTOOL
-    @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-
-
+
-    \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
-    test -z "\$\$fail"
@@ -289 +288 @@
-if USE_LIBTOOL
-    @if test -z "\$(libvlc_LTLIBRARIES)"; then \
-
+builtin 
-      m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
-      test -z "\$\$m" || \
@@ -305 +304 @@
-      esac; \
-    done
-    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-    for mod in \$(mods); do \
-      case "\$\$z " \
-        in *\ \$\${mod}\ *) \
-          echo \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-          \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
-          ;; \
-      esac; \
-    done
-endif
-
@@ -319 +309 @@
-if USE_LIBTOOL
-    @if test -z "\$(libvlc_LTLIBRARIES)"; then \
-
+builtin 
-      m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
-      test -z "\$\$m" || \
@@ -331 +321 @@
-          echo rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" ; \
-          rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" || true; \
-          ;; \
-      esac; \
-    done
-    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-    for mod in \$(mods); do \
-      case "\$\$z " \
-        in *\ \$\${mod}\ *) \
-          echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" ; \
-          rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" || true; \
-          ;; \
-      esac; \
@@ -398 +379 @@
-
-lib${mod}_a_SOURCES = \$(SOURCES_${mod})
-lib${mod}_builtin_la_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})
-nodist_lib${mod}_builtin_la_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
@@ -409 +388 @@
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
-lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
-lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
-lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
-lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-
-EOF

configure.ac

@@ -5520 +5520 @@
-AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no"], [
-  AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
-
-
-
-
+
+
+
+
+
+
+
+
-VLC_CONDITIONALS
-

src/Makefile.am

@@ -125 +125 @@
-
-stamp-builtins: Makefile ../vlc-config ../config.status
-if USE_LIBTOOL
-    @for c in `$(VLC_CONFIG) --libs builtin`; do \
-        case $$c in \
-                ../modules/*.a) echo $$c ;; \
-        esac ; \
-    done | \
-    sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2_builtin.la,g' | \
-    while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
-endif
-if BUILD_SHARED
-    @for c in `$(VLC_CONFIG) --libs builtin`; do \
@@ -150 +141 @@
-
-libvlc_a_SOURCES = $(SOURCES_libvlc)
-
+ -DUSE_BUILTINS
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
@@ -159 +150 @@
-libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
- builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'
+
-libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
-