Commit 2e743e00 authored by Sam Hocevar's avatar Sam Hocevar

* 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.
parent d9010f22
......@@ -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
###############################################################################
......
#! /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)
......
......@@ -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
......
......@@ -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 )
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment