octave-cvsupdate

[Octave-cvsupdate] SF.net SVN: octave:[5589] trunk/octave-forge/main/odepkg/src/Makefile

[<tr...@us...>]

Revision: 5589
          http://octave.svn.sourceforge.net/octave/?rev=5589&view=rev
Author:   treichl
Date:     2009-03-08 15:35:04 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Change compiler flags in MKF77FILE.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2009-03-07 18:39:05 UTC (rev 5588)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2009-03-08 15:35:04 UTC (rev 5589)
@@ -9,10 +9,11 @@
 
 # MKOCTFILE = $(MKOCTFILE) has already been defined in Makeconf
 # MKMEXFILE = $(MKOCTFILE) --mex
-ifeq (fort77,$(findstring fort77,$(F77)))
+ifeq (gfortran,$(findstring gfortran,$(F77)))
+  MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
+else
+  # eg. fort77-f2c and g95
   MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
-else
-  MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
 endif
 
 EXTERNALDIRS  = hairer cash daskr


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

[Octave-cvsupdate] SF.net SVN: octave:[8199] trunk/octave-forge/main/odepkg/src/Makefile

[<tr...@us...>]

Revision: 8199
          http://octave.svn.sourceforge.net/octave/?rev=8199&view=rev
Author:   treichl
Date:     2011-04-08 20:11:10 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
$(MKOCTFILE) isn't defined anymore?

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2011-04-08 19:28:45 UTC (rev 8198)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2011-04-08 20:11:10 UTC (rev 8199)
@@ -9,6 +9,7 @@
 
 # MKOCTFILE = $(MKOCTFILE) has already been defined in Makeconf
 # MKMEXFILE = $(MKOCTFILE) --mex
+MKOCTFILE = mkoctfile
 ifeq (gfortran,$(findstring gfortran,$(F77)))
   MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
 endif


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

[Octave-cvsupdate] SF.net SVN: octave:[9516] trunk/octave-forge/main/odepkg/src/Makefile

[<car...@us...>]

Revision: 9516
          http://octave.svn.sourceforge.net/octave/?rev=9516&view=rev
Author:   carandraug
Date:     2012-01-10 17:43:14 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
odepkg: makefile updated to link to LAPACK. Patch submitted by marco atzeri <mar...@gm...>

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-01-10 17:40:19 UTC (rev 9515)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-01-10 17:43:14 UTC (rev 9516)
@@ -20,6 +20,9 @@
   MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
 endif
 
+LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
+FLIBS := $(shell mkoctfile -p FLIBS)
+
 EXTERNALDIRS  = hairer cash daskr
 EXTERNALPACKS = $(patsubst %, %.tgz,  $(EXTERNALDIRS))
 EXTERNALDIFFS = $(patsubst %, %.diff, $(EXTERNALDIRS))
@@ -44,7 +47,8 @@
 all : $(EXTERNALDIRS) $(SOLVEROCTFILE)
 
 $(SOLVEROCTFILE) : $(EXTERNALDIRS) $(SOLVEROBJECTS)
-	$(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE)
+	$(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE) \
+        $(LAPACK_LIBS) $(FLIBS)
 
 install :
 	@$(INSTALL) -d $(DESTDIR)$(MPATH)/odepkg

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

[Octave-cvsupdate] SF.net SVN: octave:[10529] trunk/octave-forge/main/odepkg/src/Makefile

[<cd...@us...>]

Revision: 10529
          http://octave.svn.sourceforge.net/octave/?rev=10529&view=rev
Author:   cdf
Date:     2012-05-28 07:55:30 +0000 (Mon, 28 May 2012)
Log Message:
-----------
makefile change to support linking apple veclib

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-05-27 20:31:31 UTC (rev 10528)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-05-28 07:55:30 UTC (rev 10529)
@@ -9,7 +9,9 @@
 
 # MKOCTFILE = $(MKOCTFILE) has already been defined in Makeconf
 # MKMEXFILE = $(MKOCTFILE) --mex
-MKOCTFILE = mkoctfile
+MKOCTFILE ?= mkoctfile
+
+FFLAGS := $(shell $(MKOCTFILE) -p FFLAGS)
 ifeq (gfortran,$(findstring gfortran,$(F77)))
   MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
 endif
@@ -20,8 +22,8 @@
   MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
 endif
 
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-FLIBS := $(shell mkoctfile -p FLIBS)
+LAPACK_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
 
 EXTERNALDIRS  = hairer cash daskr
 EXTERNALPACKS = $(patsubst %, %.tgz,  $(EXTERNALDIRS))

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

[Octave-cvsupdate] SF.net SVN: octave:[10830] trunk/octave-forge/main/odepkg/src/Makefile

[<tho...@us...>]

Revision: 10830
          http://octave.svn.sourceforge.net/octave/?rev=10830&view=rev
Author:   thomas-weber
Date:     2012-08-05 21:22:05 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Ensure that the correct FFLAGS value is passed to gfortran.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-08-05 15:13:33 UTC (rev 10829)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-08-05 21:22:05 UTC (rev 10830)
@@ -13,14 +13,12 @@
 
 FFLAGS := $(shell $(MKOCTFILE) -p FFLAGS)
 ifeq (gfortran,$(findstring gfortran,$(F77)))
-  MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
+  FFLAGS := "-fno-automatic $(FFLAGS)"
 endif
 ifeq (g95,$(findstring g95,$(F77)))
-  MKF77FILE = FFLAGS="-fstatic $(FFLAGS)" $(MKOCTFILE)
-else
-  # eg. the combination f2c with fort77
-  MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
+  FFLAGS := "-fstatic $(FFLAGS)"
 endif
+MKF77FILE = FFLAGS=$(FFLAGS) $(MKOCTFILE)
 
 ifndef LAPACK_LIBS
 LAPACK_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) $(shell $(MKOCTFILE) -p LAPACK_LIBS)

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