From 03019d581691453e9fb22cabaf12340e6b13c7f8 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 29 Oct 2002 18:12:07 +0000 Subject: [PATCH] * ./Makefile.am: fixed a typo that caused HAVE_DEBUG to imply HAVE_RELEASE. * ./bootstrap: fixed calls to $(LINK) which had duplicate -o options. --- Makefile.am | 4 ++-- bootstrap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index be681e002a..a813154e14 100644 --- 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 fa29a3ba3c..fa85b8b46e 100755 --- 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 @@ -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 -- 2.39.2