Changeset 2e743e0019e0876e5aa70186187fbd34350f8ca5

Timestamp:

01/07/03 14:50:56 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1057063856 +0000

git-parent:

[d9010f221fa9a2d88ffca0a476e34dbac11bdc84]

git-author:

Sam Hocevar <sam@videolan.org> 1057063856 +0000

Message:

• 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.
  

Files:

• Makefile.am (modified) (5 diffs)
• bootstrap (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• src/misc/modules_plugin.h.in (modified) (2 diffs)
• vlc-config.in.in (modified) (2 diffs)

Makefile.am

@@ -36 +36 @@
-# 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
-
-###############################################################################
@@ -128 +125 @@
-
-intl/libintl.a: FORCE
-
+ $(AM_MAKEFLAGS)
-
-if BUILD_INTL
@@ -351 +348 @@
-# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
-# old automake-1.5 bug (automake/279).
- builtins
+
-
-vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@@ -389 +386 @@
-vlc_app_DATA = VLC.app
-vlc_appdir = $(bindir)
- plugins
+
-    rm -Rf VLC.app
-    cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
@@ -424 +421 @@
-
-###############################################################################
-# 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
-###############################################################################

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for the VLC media player
-3 2003/06/27 23:31:24
+4 2003/07/01 12:50:56
-##
-##  Authors: Sam Hocevar <sam@zoy.org>
@@ -133 +133 @@
-# 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

debian/changelog

@@ -4 +4 @@
-    + Fixed compilation for Alpha.
-  * debian/rules:
-
+ (Closes: #199427)
-
- -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sun, 29 Jun 2003 21:12:10 +0200

src/misc/modules_plugin.h.in

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-9 2003/02/10 20:11:14
+10 2003/07/01 12:50:56
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -59 +59 @@
-     * 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" ) )
-    {

vlc-config.in.in

@@ -14 +14 @@
-builtins="@BUILTINS@"
-
-${cppflags} -DDEBUG
-${cflags} -g
-${cxxflags} -g
-${objcflags} -g
-${objcflags} -g
+
+
+
+
+
-
-cflags_tuning="@CFLAGS_TUNING@"
@@ -106 +106 @@
-  cxxflags="${cxxflags} -g"
-  objcflags="${objcflags} -g"
-objc
+ld
-fi
-if [ "${cprof}" = yes ]; then