Changeset 2560 in Sophya

Timestamp:

Jul 23, 2004, 12:53:02 PM (21 years ago)

Author:

cmv

Message:

add -lapack for OSF1 for missing lapack routines in dxml (cmv 23/07/04)

Location:

trunk/SophyaLib/Mgr

Files:

• Makefile (modified) (2 diffs)
• makefileuser.inc (modified) (2 diffs)
• mkmf (modified) (3 diffs)

trunk/SophyaLib/Mgr/Makefile

@@ -109 +109 @@
 # defining the other external libraries needed on different systems
 
-# On Linux   lapack and blas and f2c/g2c ere needed
+# On Linux   lapack and blas and f2c/g2c are needed
 ifeq ($(MACHEROS),Linux)
 #EXTLIB = $(EXTLIBL) -llapack -lblas -lf2c
@@ -117 +117 @@
 endif
 
-# On OSF1 libdxml contains Lapack, but the fortran support library is needed
+# On OSF1 libdxml contains 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) -ldxml -lfor
-EXTSLB = $(EXTSLBL) -ldxml -lfor
+EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor
+EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor
 endif
 

trunk/SophyaLib/Mgr/makefileuser.inc

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

trunk/SophyaLib/Mgr/mkmf

@@ -1 +1 @@
 #!/bin/csh 
-# $Id: mkmf,v 1.19 2003-09-17 12:19:26 cmv Exp $
+# $Id: mkmf,v 1.20 2004-07-23 10:53:02 cmv Exp $
 
 #  Pour debugger 
@@ -182 +182 @@
 echo '# defining the other external libraries needed on different systems'   >> GNUmakefile
 echo ''                                   >> GNUmakefile
-echo '# On Linux   lapack and blas and f2c/g2c ere needed'   >> GNUmakefile
+echo '# On Linux   lapack and blas and f2c/g2c are needed'   >> GNUmakefile
 echo 'ifeq ($(MACHEROS),Linux)'   >> GNUmakefile
 echo '#EXTLIB = $(EXTLIBL) -llapack -lblas -lf2c'   >> GNUmakefile
@@ -189 +189 @@
 echo 'EXTSLB = $(EXTSLBL) -llapack -lblas -lg2c'   >> GNUmakefile
 echo 'endif'   >> GNUmakefile
-echo '# On OSF1 libdxml contains Lapack, but the fortran support library is needed'   >> GNUmakefile
+echo '# On OSF1 libdxml contains part of Lapack, and the fortran support library is needed'   >> GNUmakefile
+echo '#  (we still need to add liblapack.a to supply missing lapack routines in dxml)'   >> GNUmakefile
 echo 'ifeq ($(MACHEROS),OSF1)'   >> GNUmakefile
-echo 'EXTLIB = $(EXTLIBL) -ldxml -lfor'   >> GNUmakefile
-echo 'EXTSLB = $(EXTSLBL) -ldxml -lfor'   >> GNUmakefile
+echo 'EXTLIB = $(EXTLIBL) -llapack -ldxml -lfor'   >> GNUmakefile
+echo 'EXTSLB = $(EXTSLBL) -llapack -ldxml -lfor'   >> GNUmakefile
 echo 'endif'   >> GNUmakefile
 echo ''                                   >> GNUmakefile