Changeset 5b369300e5f7093ac99f2f626533e7f9bc9b66fb

Timestamp:

06/04/06 19:07:19 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[7cc72564f95e39aa619884fecb04558db63bd6c9]

git-author:

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

Message:

Suppress support for position dependant code (except on mingw32).
This simplifies the build system quite a lot, and reduce compilation
times when PIC is actually needed.

If you really mind the extra overhead of PIC, use:
./configure --enable-libtool --enable-static --disable-shared

Files:

• Makefile.am (modified) (1 diff)
• bootstrap (modified) (7 diffs)
• configure.ac (modified) (5 diffs)
• mozilla/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (4 diffs)

Makefile.am

@@ -10 +10 @@
-#  - intl should come before modules and . because all the code uses gettext
-#  - modules should come before . because vlc needs the builtins
-_pic
+
-#  - po should come before . because VLC.app needs the pofiles
-#  - loader should come before modules because some plugins need it

bootstrap

@@ -193 +193 @@
-  for mod in $mods
-  do
- lib${mod}_pic.a
+
-    extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}_builtin.la"
-  done
@@ -241 +241 @@
-    if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
-    if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\
-    if test "\$(pic)" = "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
-    \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
-    test -z "\$\$fail"
@@ -306 +305 @@
-      esac; \
-    done
-if BUILD_PIC
-    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-    for mod in \$(mods); do \
-      case "\$\$z " \
-        in *\ \$\${mod}\ *) \
-          echo \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
-          \$(INSTALL_DATA) "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
-          ;; \
-      esac; \
-    done
-endif
-endif
-
@@ -346 +334 @@
-      esac; \
-    done
-if BUILD_PIC
-    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
-    for mod in \$(mods); do \
-      case "\$\$z " \
-        in *\ \$\${mod}\ *) \
-          echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" ; \
-          rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" || true; \
-          ;; \
-      esac; \
-    done
-endif
-endif
-
@@ -410 +387 @@
-lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
-
-lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_pic_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
-lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
-lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
-lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
-
-lib${mod}_a_SOURCES = \$(SOURCES_${mod})
-lib${mod}_builtin_la_SOURCES = \$(SOURCES_${mod})
@@ -430 +396 @@
-    fi
-    cat >> "${makf}" << EOF
-
-
-
+\$(pic) 
+\$(pic) 
+\$(pic) 
-lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
-lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
@@ -479 +445 @@
-rm -f ABOUT-NLS
-rm -Rf intl
-
-
-
+
-rm -f stamp-builtin stamp-h* mozilla/stamp-pic
-

configure.ac

@@ -1442 +1442 @@
-dnl  Is the shared libvlc forced ?
-dnl
-build_pic=no
-AC_ARG_ENABLE(shared-libvlc,
-  [  --enable-shared-libvlc  Win32 libvlc.dll build (default disabled)])
@@ -5225 +5224 @@
-  if test "${enable_mozilla}" != "false"
-  then
-    build_pic=yes
-    AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner)
-    if test "${XPIDL}" = "no"; then
@@ -5241 +5239 @@
-dnl TODO: look for python dev headers
-AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"])
-if test "${enable_mediacontrol_python_bindings}" = "yes"
-then
-  build_pic=yes
-fi
-
-dnl
@@ -5252 +5246 @@
-  [  --enable-java-bindings  Enable Java bindings (default disabled)])
-AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
-if test "${enable_java_bindings}" = "yes"
-then
-  build_pic=yes
-fi
-
-dnl
-dnl  Enable pic libraries
-dnl
-AC_ARG_ENABLE(pic,
-  [  --enable-pic            Enable pic libraries (default disabled)])
-AM_CONDITIONAL(BUILD_PIC, [test "${enable_pic}" = "yes"])
-if test "${enable_pic}" = "yes"
-then
-  build_pic=yes
-fi
-
-
-dnl
@@ -5401 +5379 @@
-  FILE_LIBVLC_DLL="" )
-
-
-
-
-
+
+
-AC_SUBST(pic)
-
-AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" && test "x${pic}" = "xpic"])
-
-dnl Import conditional variables generated by bootstrap

mozilla/Makefile.am

@@ -26 +26 @@
-LIBRARIES_libvlc_nopic = $(LIBRARIES_libvlc_pic)
-else
-_pic
+
-LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
-endif

src/Makefile.am

@@ -132 +132 @@
-endif
-if BUILD_SHARED
-
-
+
-        case $$c in \
-            ../modules/*.a) echo $$c ;; \
@@ -139 +138 @@
-    done | \
-    sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
-$$ext; eval "($$cmd$$ext
+.a; eval "($$cmd.a
-endif
-    touch $@
@@ -151 +150 @@
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-
-libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
-libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
-libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
-libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
-
-libvlc_la_SOURCES = $(SOURCES_libvlc)
@@ -191 +185 @@
-else
-lib_LIBRARIES = libvlc.a
-if BUILD_PIC
-lib_LIBRARIES += libvlc_pic.a
-endif
-endif
-