* bootstrap:

    + The clean rule properly removes generated objects.
    + Optimized recursive builds.
  * debian/rules:
    + Fixed a typo in the changelog installation.

bootstrap

 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.57 2003/07/01 17:28:50 sam Exp $
+##  $Id: bootstrap,v 1.58 2003/07/02 11:21:26 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -94,6 +94,10 @@ SUBDIRS = ${subdirs}
 #DIST_SUBDIRS = \$(SUBDIRS)
 libvlcdir = \$(libdir)/vlc/${basedir}
 include Modules.am
+
+clean:
+	rm -f *.a *.so *.dll *.sl *.dylib
+
 EOF
   for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
   do
@@ -124,8 +128,8 @@ EOF
 all: all-${mod}
 
 all-${mod}:
-	if \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi
-	if \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi
+	if \$(VLC_CONFIG) --target plugin | grep "${dir}/lib${mod}_plugin" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_plugin\$(LIBEXT); fi \\
+	if \$(VLC_CONFIG) --target builtin | grep "${dir}/lib${mod}\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}.a; fi \\
 if BUILD_MOZILLA
 	if \$(VLC_CONFIG) --target builtin pic | grep "${dir}/lib${mod}_pic\\.a" >/dev/null 2>&1 ; then \$(MAKE) \$(AM_MAKEFLAGS) lib${mod}_pic.a; fi
 endif

debian/rules

@@ -366,7 +366,7 @@ binary-arch: build install
 	dh_installman doc/vlc-config.1 -p libvlc0-dev
 #	dh_installchangelogs ChangeLog -p vlc
 	cp ChangeLog debian/vlc/usr/share/doc/vlc/changelog
-	for x in doc/ChangeLog-* ; do cp "doc/ChangeLog-$${x\#*/\#*-}" "debian/vlc/usr/share/doc/vlc/changelog-$$x\#*/\#*-}" ; done
+	for x in doc/ChangeLog-* ; do cp "doc/ChangeLog-$${x\#*/\#*-}" "debian/vlc/usr/share/doc/vlc/changelog-$${x\#*/\#*-}" ; done
 	cp debian/changelog debian/vlc/usr/share/doc/vlc/changelog.Debian
 	dh_link -s
 	dh_strip -s