Revision: 10195 http://pure-data.svn.sourceforge.net/pure-data/?rev=10195&view=rev Author: zmoelnig Date: 2008-07-22 09:37:21 +0000 (Tue, 22 Jul 2008)
Log Message: ----------- updated to use LDFLAGS instead of LFLAGS and cc instead of ld as suggested by federico (bug#2021648)
Modified Paths: -------------- trunk/externals/zexy/build/autoconf/Make.config.in trunk/externals/zexy/build/autoconf/Makefile trunk/externals/zexy/build/autoconf/configure.ac
Modified: trunk/externals/zexy/build/autoconf/Make.config.in =================================================================== --- trunk/externals/zexy/build/autoconf/Make.config.in 2008-07-22 09:26:07 UTC (rev 10194) +++ trunk/externals/zexy/build/autoconf/Make.config.in 2008-07-22 09:37:21 UTC (rev 10195) @@ -20,7 +20,7 @@ STRIPFLAGS= @STRIPFLAGS@
AFLAGS = -LFLAGS = @LFLAGS@ +LDFLAGS = @LDFLAGS@ WFLAGS =
TARNAME = $(LIBNAME)-@LIBRARY_VERSION@.tgz
Modified: trunk/externals/zexy/build/autoconf/Makefile =================================================================== --- trunk/externals/zexy/build/autoconf/Makefile 2008-07-22 09:26:07 UTC (rev 10194) +++ trunk/externals/zexy/build/autoconf/Makefile 2008-07-22 09:37:21 UTC (rev 10195) @@ -51,11 +51,11 @@ endif
$(OBJECTS): %.$(EXT) : %.o - $(LD) $(LFLAGS) -o $@ $*.o $(LIBS) + $(CC) $(LDFLAGS) -o $@ $*.o $(LIBS) $(STRIP) $(STRIPFLAGS) $@
$(LIBNAME): $(TARGETS) z_zexy.c z_zexy.h - $(LD) $(LFLAGS) -o $@.$(EXT) $(SOURCEDIR)/*.o $(LIBS) + $(CC) $(LDFLAGS) -o $@.$(EXT) $(SOURCEDIR)/*.o $(LIBS) $(STRIP) $(STRIPFLAGS) $@.$(EXT)
$(TARGETS): %.o : %.c
Modified: trunk/externals/zexy/build/autoconf/configure.ac =================================================================== --- trunk/externals/zexy/build/autoconf/configure.ac 2008-07-22 09:26:07 UTC (rev 10194) +++ trunk/externals/zexy/build/autoconf/configure.ac 2008-07-22 09:37:21 UTC (rev 10195) @@ -12,7 +12,7 @@ AC_SUBST(CFLAGS) AC_SUBST(DEFS) AC_SUBST(DFLAGS) -AC_SUBST(LFLAGS) +AC_SUBST(LDFLAGS) AC_SUBST(EXT) AC_SUBST(LD) AC_SUBST(STRIP) @@ -38,7 +38,6 @@ AC_ARG_WITH(pdpath, [ --with-pd=</path/to/pd> where to look for pd-headers and and -libs]) AC_ARG_ENABLE(PIC, [ --disable-PIC disable compilation with PIC-flag]) AC_ARG_ENABLE(PIC, [ --disable-exportdynamic disable linkage with the export_dynamic-flag]) -AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(library,[ --disable-library split the library into single externals])
@@ -50,10 +49,6 @@ enable_lpt="${with_lpt}" fi
-if test "x" = "x${enable_icc}" ; then - enable_icc="${with_icc}" -fi - if test "xno" != "x${enable_library}" ; then dnl LATER: find a more generic way to generate the .._LIBRARY define BUILDLIBRARY="-DZEXY_LIBRARY" @@ -62,7 +57,6 @@ if test `uname | sed -e 's/^MINGW.*/NT/'` = NT ; then LD=${CC} -# LDFLAGS="-shared pd.dll" EXT=dll if test "x" = "x${enable_exportdynamic}" ; then enable_exportdynamic="no" @@ -120,18 +114,8 @@ dnl AC_CHECK_LIB(stk, main, STK=yes)
-dnl for now i can test ICC only on linux dnl LATER we might want to use it for other platforms (namely:windoze) too
-if test `uname -s` = Linux; -then - AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) - if test "$enable_icc" = "yes"; then - CC=icc - LD=icc - fi -fi - AC_CHECK_LIB(pd, nullfn)
AC_CHECK_LIB(regex, regcomp) @@ -299,16 +283,6 @@ then EXT=pd_linux STRIPFLAGS="--strip-unneeded" - if test "$enable_icc" = "yes"; then - CC=icc - fi - - if test $CC = "icc" - then - LD=$CC - AC_CHECK_LDFLAGS([-ip -ipo_obj]) - AC_CHECK_CFLAGS([-ip -ipo_obj]) - fi fi
dnl This should use '-bundle_loader /path/to/pd/bin/pd' instead of'-undefined suppress' @@ -338,9 +312,8 @@
if test `uname -s` = IRIX64; then - LDFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ - -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ - -shared -rdata_shared" + LDFLAGS="-shared,-rdata_shared" + CFLAGS="-DUNIX -DIRIX -DN32 -woff 1080,1064,1185 -n32 -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true" EXT=pd_irix6 dnl DFLAGS="-DUNIX -DIRIX6" STRIPFLAGS="--strip-unneeded" @@ -355,8 +328,9 @@
if test `uname -s` = IRIX32; then - LDFLAGS="-o32 -DUNIX -DIRIX -O2 - -shared -rdata_shared" + LDFLAGS="-o32,-shared,-rdata_shared" + CFLAGS="-o32 -DUNIX -DIRIX -O2" + EXT=pd_irix5 dnl DFLAGS="-DUNIX -DIRIX5" STRIPFLAGS="--strip-unneeded" @@ -422,6 +396,5 @@ "--with-pd=</path/to/pd/>" or "--includedir=</path/to/pd/src/>"]))
-LFLAGS=${LDFLAGS} AC_OUTPUT(Make.config)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.