* ./Makefile.am: fixed a typo that caused HAVE_DEBUG to imply HAVE_RELEASE.

  * ./bootstrap: fixed calls to $(LINK) which had duplicate -o options.

diff --git a/Makefile.am b/Makefile.am
index be681e002ae326221708209861d1798ec8b6a8f1..a813154e145b39899ff3b7d76c978acbf9b7cfe0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,7 @@ if RELEASE
 CPPFLAGS_release = -DHAVE_RELEASE
 endif
 if DEBUG
-CPPFLAGS_debug = -DDEBUG -DHAVE_RELEASE
+CPPFLAGS_debug = -DDEBUG
 CFLAGS_debug = -g
 endif
 if GPROF
@@ -468,7 +468,7 @@ mozilla_plugindir = $(libdir)/mozilla/plugins
 $(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
                       $(mozilla_libplugin_a_DEPENDENCIES) \
                       $(L_builtin_pic)
-       $(CXXLINK) -o $@ $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
+       $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
                lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \
                $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic)
 

diff --git a/bootstrap b/bootstrap
index fa29a3ba3c0bd60c13db5b3773d2fb4dbf5d7719..fa85b8b46ea6b72453ab0024a92fab7fdbaa08ff 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.20 2002/10/25 09:24:29 sam Exp $
+##  $Id: bootstrap,v 1.21 2002/10/29 18:12:07 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -155,7 +155,7 @@ lib${mod}dir = \$(libdir)/vlc/${topdir}
 MOSTLYCLEANFILES += \$(D_${mod}_p)
 ${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
 ${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}     \$(${LINKER}) \$^ -o \$@ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
+${PRIVATE}     \$(${LINKER}) \$^ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
 
 
 EOF