From: Sam Hocevar Date: Tue, 8 Jul 2003 13:40:57 +0000 (+0000) Subject: * bootstrap: Removed dashes from makefile variables. X-Git-Tag: 0.6.1~181 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=31f0666a4667eaed90ee21bf5a766e02e7d3d49d;p=vlc * bootstrap: Removed dashes from makefile variables. --- diff --git a/bootstrap b/bootstrap index b844b4d091..b9a973a57b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh ## bootstrap file for the VLC media player -## $Id: bootstrap,v 1.67 2003/07/08 13:09:30 sam Exp $ +## $Id: bootstrap,v 1.68 2003/07/08 13:40:57 sam Exp $ ## ## Authors: Sam Hocevar @@ -160,10 +160,10 @@ else endif if UNTRUE -L${mod}-p = lib${mod}_plugin.a -D${mod}-p = lib${mod}_plugin\$(LIBEXT) -L${mod}-b = lib${mod}.a -L${mod}-pic = lib${mod}_pic.a +L${mod}p = lib${mod}_plugin.a +D${mod}p = lib${mod}_plugin\$(LIBEXT) +L${mod}b = lib${mod}.a +L${mod}pic = lib${mod}_pic.a EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF B${mod} = \$(nodist_SOURCES_${mod}) @@ -211,11 +211,11 @@ lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` -libvlc_LIBRARIES += \$(L${mod}-b) \$(L${mod}-pic) -lib${mod}_DATA = \$(D${mod}-p) +libvlc_LIBRARIES += \$(L${mod}b) \$(L${mod}pic) +lib${mod}_DATA = \$(D${mod}p) lib${mod}dir = \$(libdir)/vlc/${topdir} -${PRIVATE}noinst_LIBRARIES += \$(L${mod}-p) +${PRIVATE}noinst_LIBRARIES += \$(L${mod}p) ${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS) ${PRIVATE} @case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\ ${PRIVATE} c++) echo \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\