[Octave-cvsupdate] SF.net SVN: octave:[10624] trunk/octave-forge/main

[<i7...@us...>]

Revision: 10624
          http://octave.svn.sourceforge.net/octave/?rev=10624&view=rev
Author:   i7tiol
Date:     2012-06-12 14:28:58 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
More compatible passing of linker flags to mkoctfile.

Modified Paths:
--------------
    trunk/octave-forge/main/linear-algebra/src/Makefile
    trunk/octave-forge/main/octgpr/src/Makefile.in
    trunk/octave-forge/main/odepkg/src/Makefile
    trunk/octave-forge/main/optiminterp/src/Makefile

Property Changed:
----------------
    trunk/octave-forge/main/miscellaneous/inst/hermitepoly.m
    trunk/octave-forge/main/miscellaneous/inst/hilbert_curve.m
    trunk/octave-forge/main/miscellaneous/inst/peano_curve.m
    trunk/octave-forge/main/miscellaneous/inst/z_curve.m

Modified: trunk/octave-forge/main/linear-algebra/src/Makefile
===================================================================
--- trunk/octave-forge/main/linear-algebra/src/Makefile	2012-06-12 14:11:58 UTC (rev 10623)
+++ trunk/octave-forge/main/linear-algebra/src/Makefile	2012-06-12 14:28:58 UTC (rev 10624)
@@ -4,7 +4,14 @@
 MKOCTFILE = mkoctfile
 endif
 
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
+ifndef LAPACK_LIBS
+LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+endif
+ifndef BLAS_LIBS
+BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
+endif
+LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS)
+export LFLAGS
 
 DEFINES = -DHAVE_CONFIG_H -Wall
 GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o 

Modified: trunk/octave-forge/main/octgpr/src/Makefile.in
===================================================================
--- trunk/octave-forge/main/octgpr/src/Makefile.in	2012-06-12 14:11:58 UTC (rev 10623)
+++ trunk/octave-forge/main/octgpr/src/Makefile.in	2012-06-12 14:28:58 UTC (rev 10624)
@@ -24,7 +24,8 @@
 FFLAGS=@FFLAGS@ @FPICFLAG@
 CC=@CC@ @CPICFLAG@
 CFLAGS=@CFLAGS@ -I.
-LIBS=@LIBS@
+LFLAGS=@LIBS@
+export LFLAGS
 
 OBJS_GPR_TRAIN=dsdacc.o dwdis2.o dtr2tp.o corrf.o stheta.o \
 	       nllgpr.o nldgpr.o nl0gpr.o pakgpr.o \
@@ -55,14 +56,14 @@
 	$(MKOCTFILE) -c $<
 
 gpr_train.oct: gpr_train.o $(OBJS_GPR_TRAIN)
-	$(MKOCTFILE) -o $@ gpr_train.o $(OBJS_GPR_TRAIN) $(LIBS)
+	$(MKOCTFILE) -o $@ gpr_train.o $(OBJS_GPR_TRAIN)
 gpr_predict.oct: gpr_predict.o $(OBJS_GPR_PRED) 
-	$(MKOCTFILE) -o $@ gpr_predict.o $(OBJS_GPR_PRED) $(LIBS)
+	$(MKOCTFILE) -o $@ gpr_predict.o $(OBJS_GPR_PRED)
 
 pgp_train.oct: pgp_train.o $(OBJS_GPR_TRAIN)
-	$(MKOCTFILE) -o $@ pgp_train.o $(OBJS_GPR_TRAIN) $(LIBS)
+	$(MKOCTFILE) -o $@ pgp_train.o $(OBJS_GPR_TRAIN)
 pgp_predict.oct: pgp_predict.o $(OBJS_GPR_PRED) 
-	$(MKOCTFILE) -o $@ pgp_predict.o $(OBJS_GPR_PRED) $(LIBS)
+	$(MKOCTFILE) -o $@ pgp_predict.o $(OBJS_GPR_PRED)
 
 pdist2_mw.oct: pdist2_mw.cc
 	$(MKOCTFILE) -o $@ $<

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-06-12 14:11:58 UTC (rev 10623)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-06-12 14:28:58 UTC (rev 10624)
@@ -22,8 +22,13 @@
   MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
 endif
 
+ifndef LAPACK_LIBS
 LAPACK_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+endif
+ifndef FLIBS
 FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
+endif
+LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(FLIBS)
 
 EXTERNALDIRS  = hairer cash daskr
 EXTERNALPACKS = $(patsubst %, %.tgz,  $(EXTERNALDIRS))
@@ -49,7 +54,7 @@
 all : $(EXTERNALDIRS) $(SOLVEROCTFILE)
 
 $(SOLVEROCTFILE) : $(EXTERNALDIRS) $(SOLVEROBJECTS)
-	$(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE) \
+	LFLAGS="$(LFLAGS)" $(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE) \
         $(LAPACK_LIBS) $(FLIBS)
 
 install :

Modified: trunk/octave-forge/main/optiminterp/src/Makefile
===================================================================
--- trunk/octave-forge/main/optiminterp/src/Makefile	2012-06-12 14:11:58 UTC (rev 10623)
+++ trunk/octave-forge/main/optiminterp/src/Makefile	2012-06-12 14:28:58 UTC (rev 10624)
@@ -7,8 +7,16 @@
 
 TARGETS=optiminterp.oct
 
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-FLIBS := $(shell mkoctfile -p FLIBS) 
+ifndef LAPACK_LIBS
+LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+endif
+ifndef BLAS_LIBS
+BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
+endif
+ifndef FLIBS
+FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
+endif
+LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 # Rule for compiling Fortran 90 programs
 
@@ -24,7 +32,8 @@
 
 
 optiminterp.oct: $(OBJECTS)
-	$(MKOCTFILE) -o $@ $(OBJECTS) $(LIBS) $(LAPACK_LIBS) $(FLIBS)
+	LFLAGS="$(LFLAGS)" \
+               $(MKOCTFILE) -o $@ $(OBJECTS) $(LIBS) $(LAPACK_LIBS) $(FLIBS)
 
 check:
 	octave --silent --norc --eval test_optiminterp

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.