Mercurial > forge

changeset 10438:779f718ca4b0 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More compatible passing of linker flags to mkoctfile.
author i7tiol
date Tue, 12 Jun 2012 14:28:58 +0000
parents 9a865c20ee2e
children 6c19a05abd36
files main/linear-algebra/src/Makefile main/octgpr/src/Makefile.in main/odepkg/src/Makefile main/optiminterp/src/Makefile
diffstat 4 files changed, 32 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/main/linear-algebra/src/Makefile	Tue Jun 12 14:11:58 2012 +0000
+++ b/main/linear-algebra/src/Makefile	Tue Jun 12 14:28:58 2012 +0000
@@ -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 
--- a/main/octgpr/src/Makefile.in	Tue Jun 12 14:11:58 2012 +0000
+++ b/main/octgpr/src/Makefile.in	Tue Jun 12 14:28:58 2012 +0000
@@ -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 $@ $<
--- a/main/odepkg/src/Makefile	Tue Jun 12 14:11:58 2012 +0000
+++ b/main/odepkg/src/Makefile	Tue Jun 12 14:28:58 2012 +0000
@@ -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 :
--- a/main/optiminterp/src/Makefile	Tue Jun 12 14:11:58 2012 +0000
+++ b/main/optiminterp/src/Makefile	Tue Jun 12 14:28:58 2012 +0000
@@ -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