* Makefile.am:

    + Forward AM_MAKEFLAGS through recursive makefiles.
    + Removed the plugins and builtins rules. This causes libintl to be built
      before the plugins.
  * bootstrap:
    + Enabled recursive builds of plugins and builtins.
  * vlc-config.in.in:
    + Fixed a typo.
  * debian/changelog:
    + Next upload will fix bug #199427.

diff --git a/Makefile.am b/Makefile.am
index 0f4fda9ddb1a671790184005250ccd41c87ce07a..47eed0b7a030ac38cd4f7de5dcbb09cf17b5f836 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,6 @@ ACLOCAL_AMFLAGS = -I m4
 # because old versions of automake don't support them in configure.ac.
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
 
-# Don't forget to build plugins
-all: plugins
-
 ###############################################################################
 # Headers
 ###############################################################################
@@ -127,7 +124,7 @@ $(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_in
 ###############################################################################
 
 intl/libintl.a: FORCE
-       cd $(top_builddir)/intl && $(MAKE)
+       cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
 
 if BUILD_INTL
 LIB_intl = intl/libintl.a
@@ -350,7 +347,7 @@ vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) builtins
+DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f $(srcdir)/vlc$(EXEEXT)
@@ -388,7 +385,7 @@ if HAVE_DARWIN
 # Create the MacOS X app
 vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
-VLC.app: vlc plugins
+VLC.app: vlc
        rm -Rf VLC.app
        cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
        cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
@@ -422,18 +419,6 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
        $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@
 endif
 
-###############################################################################
-# Building modules
-###############################################################################
-plugins: FORCE
-       $(MAKE) `$(VLC_CONFIG) --target plugin` FORCE
-
-builtins: FORCE
-       $(MAKE) `$(VLC_CONFIG) --target builtin` FORCE
-
-builtins_pic: FORCE
-       $(MAKE) `$(VLC_CONFIG) --target builtin pic` FORCE
-
 ###############################################################################
 # Building architecture-specific binary packages
 ###############################################################################

diff --git a/bootstrap b/bootstrap
index 856de25f5757187decfc7b7aa1ad2866775f44d9..b1b66d7083b2660ad7491a27653590f555131883 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.53 2003/06/27 23:31:24 sam Exp $
+##  $Id: bootstrap,v 1.54 2003/07/01 12:50:56 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -132,6 +132,15 @@ EOF
     cat >> ${dir}/Makefile.am << EOF
 # The ${mod} plugin
 
+all: all-${mod}
+
+all-${mod}:
+       if \$(VLC_CONFIG) --target plugin | grep -q "${dir}/lib${mod}_plugin"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi
+       if \$(VLC_CONFIG) --target builtin | grep -q "${dir}/lib${mod}\\.a"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi
+if BUILD_MOZILLA
+       if \$(VLC_CONFIG) --target builtin pic | grep -q "${dir}/lib${mod}_pic\\.a"; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a; fi
+endif
+
 if UNTRUE
 L${count}p = lib${mod}_plugin.a
 D${count}p = lib${mod}_plugin\$(LIBEXT)

diff --git a/debian/changelog b/debian/changelog
index 1512e5d1f541a95a6612d8b161f0cf165597c0e0..9dbcb41acace5af5080ca18170346d38f19de520 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ vlc (0.6.0+cvs-20030627-2) unstable; urgency=low
   * extras/ffmpeg:
     + Fixed compilation for Alpha.
   * debian/rules:
-    + Enabled the video4linux input plugin.
+    + Enabled the video4linux input plugin (Closes: #199427).
 
  -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sun, 29 Jun 2003 21:12:10 +0200
 

diff --git a/src/misc/modules_plugin.h.in b/src/misc/modules_plugin.h.in
index 07c4696493c2f165fda1c555f83536a5476af512..674680675a622ba0afa1ef3ecd6e3b6b7c061802 100644 (file)
--- a/src/misc/modules_plugin.h.in
+++ b/src/misc/modules_plugin.h.in
@@ -2,7 +2,7 @@
  * modules_plugin.h : Plugin management functions used by the core application.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_plugin.h.in,v 1.9 2003/02/10 20:11:14 sam Exp $
+ * $Id: modules_plugin.h.in,v 1.10 2003/07/01 12:50:56 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -58,6 +58,7 @@ static int module_load( const MYCHAR * psz_filename, module_handle_t * handle )
     /* XXX HACK #2 - the ugly KDE workaround. It seems that libkdewhatever
      * causes dlopen() to segfault if libstdc++ is not loaded in the caller,
      * so we just load libstdc++. Bwahahaha! ph34r! -- Sam. */
+    /* Update: FYI, this is Debian bug #180505, and seems to be fixed. */
     if( !b_kde && !strstr( psz_filename, "kde" ) )
     {
         dlopen( "libstdc++.so.6", RTLD_NOW )

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 5adcde83b3cef57678c009312a1e475fe4499d35..8bc6442f84d39387348ad1494781d05e77d32571 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -13,11 +13,11 @@ optim="@optim@"
 plugins="@PLUGINS@"
 builtins="@BUILTINS@"
 
-cppflags="${cppflags} -DDEBUG"
-cflags="${cflags} -g"
-cxxflags="${cxxflags} -g"
-objcflags="${objcflags} -g"
-ldflags="${objcflags} -g"
+cppflags=""
+cflags=""
+cxxflags=""
+objcflags=""
+ldflags=""
 
 cflags_tuning="@CFLAGS_TUNING@"
 cflags_optim="@CFLAGS_OPTIM@"
@@ -105,7 +105,7 @@ if [ "${debug}" = yes ]; then
   cflags="${cflags} -g"
   cxxflags="${cxxflags} -g"
   objcflags="${objcflags} -g"
-  ldflags="${objcflags} -g"
+  ldflags="${ldflags} -g"
 fi
 if [ "${cprof}" = yes ]; then
   cppflags="${cppflags} -DCPROF"