Commit 03019d58 authored by Sam Hocevar's avatar Sam Hocevar

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

  * ./bootstrap: fixed calls to $(LINK) which had duplicate -o options.
parent 79a4f01f
......@@ -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)
......
#! /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
......
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