Changeset 2573 in Sophya for trunk/SophyaLib/Mgr

Timestamp:

Jul 28, 2004, 4:40:12 PM (21 years ago)

Author:

cmv

Message:

pour OSF dxml vs blas+lapack cmv 28/07/04

Location:

trunk/SophyaLib/Mgr

Files:

• Makefile (modified) (1 diff)
• makefileuser.inc (modified) (2 diffs)
• mkmf (modified) (2 diffs)

trunk/SophyaLib/Mgr/Makefile

@@ -117 +117 @@
 endif
 
-# On OSF1 libdxml contains Lapack, and the fortran support library is needed
+# On OSF1 libdxml contains part of Lapack, and the fortran support library is needed
 #  (we still need to add liblapack.a to supply missing lapack routines in dxml)
 ifeq ($(MACHEROS),OSF1)
-EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor
-EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor
+###EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor
+EXTLIB = $(EXTLIBL) -ldxml -llapack -lfor
+###EXTLIB = $(EXTLIBL) -llapack -lblas -lfor
+###EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor
+EXTSLB = $(EXTSLBL) -ldxml -llapack -lfor
+###EXTSLB = $(EXTSLBL) -llapack -lblas -lfor
 endif
 

trunk/SophyaLib/Mgr/makefileuser.inc

@@ -52 +52 @@
 ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw -lxastro
 ifeq ($(MACHEROS),OSF1)
+###ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a $(EXTLIBPATH)libblas.a 
 ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a
-ELIBS := $(ELIBS) -llapack -ldxml
+###ELIBS := $(ELIBS) -llapack -lblas
+###ELIBS := $(ELIBS) -llapack -ldxml
+ELIBS := $(ELIBS) -ldxml -llapack
 endif
 ifeq ($(MACHEROS),Linux)
@@ -109 +112 @@
 ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw  -lxastro
 ifeq ($(MACHEROS),OSF1)
+###ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a $(EXTLIBPATH)libblas.a
 ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a
-ELIBS := $(ELIBS) -llapack -ldxml
+###ELIBS := $(ELIBS) -llapack -lblas
+###ELIBS := $(ELIBS) -llapack -ldxml
+ELIBS := $(ELIBS) -ldxml -llapack
 endif
 ifeq ($(MACHEROS),Linux)
-ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a $(EXTLIBPATH)libblas.a 
+ELIBF := $(ELIBF) $(EXTLIBPATH)liblapack.a $(EXTLIBPATH)libblas.a
 ELIBS := $(ELIBS) -llapack -lblas
 endif

trunk/SophyaLib/Mgr/mkmf

@@ -1 +1 @@
 #!/bin/csh 
-# $Id: mkmf,v 1.20 2004-07-23 10:53:02 cmv Exp $
+# $Id: mkmf,v 1.21 2004-07-28 14:40:12 cmv Exp $
 
 #  Pour debugger 
@@ -192 +192 @@
 echo '#  (we still need to add liblapack.a to supply missing lapack routines in dxml)'   >> GNUmakefile
 echo 'ifeq ($(MACHEROS),OSF1)'   >> GNUmakefile
-echo 'EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor'   >> GNUmakefile
-echo 'EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor'   >> GNUmakefile
+echo '###EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor'   >> GNUmakefile
+echo 'EXTLIB = $(EXTLIBL) -ldxml -llapack -lfor'   >> GNUmakefile
+echo '###EXTLIB = $(EXTLIBL) -llapack -lblas -lfor'   >> GNUmakefile
+echo '###EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor'   >> GNUmakefile
+echo 'EXTSLB = $(EXTSLBL) -ldxml -llapack -lfor'   >> GNUmakefile
+echo '###EXTSLB = $(EXTSLBL) -llapack -lblas -lfor'   >> GNUmakefile
 echo 'endif'   >> GNUmakefile
 echo ''                                   >> GNUmakefile