Changeset 1455 in Sophya

Timestamp:

Apr 10, 2001, 4:25:44 PM (24 years ago)

Author:

cmv

Message:

intro module XAstroPack cmv+rz 10/4/2001

Location:

trunk/SophyaLib/Mgr

Files:

• Makefile (modified) (4 diffs)
• README (modified) (1 diff)
• extlibdirs (modified) (1 diff)
• makefileuser.inc (modified) (3 diffs)
• mkslbsgi.csh (modified) (2 diffs)

trunk/SophyaLib/Mgr/Makefile

@@ -17 +17 @@
 cxxlibs:  SysTools TArray NTools HiStats SkyMap Samba SkyT
 
-cxxextlibs:  FitsIOServer IFFTW LinAlg
+cxxextlibs:  FitsIOServer IFFTW LinAlg XAstroPack
 
 #--- Create directory and copy includes for install
@@ -79 +79 @@
         if [ -d LinAlg ] ; then cd  LinAlg ; $(MAKE) ; fi
  
+.PHONY:  XAstroPack
+XAstroPack:
+        if [ -d XAstroPack ] ; then cd  XAstroPack ; $(MAKE) ; fi
+ 
 .PHONY: PI
 PI:
@@ -87 +91 @@
 #  List of libraries (.a)
 PSLB =  $(LIB)libSysTools.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a
-EXTPSLB =  $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a
+EXTPSLB =  $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a $(LIB)libXAstroPack.a
 PIPSLB =  $(LIB)libPI.a  $(LIB)libPIext.a
 
 #  List of external library references
-EXTLIBL  = -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw 
-EXTSLBL  = -L$(EXTSLBPATH) -lcfitsio -lfftw 
+EXTLIBL  = -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw -lxastro
+EXTSLBL  = -L$(EXTSLBPATH) -lcfitsio -lfftw -lrfftw -lxastro
 
 # defining the other external libraries needed on different systems
@@ -138 +142 @@
 OBJIFFTW = $(shell echo `cat ./IFFTW/objlist.list `)
 OBJLinAlg = $(shell echo `cat ./LinAlg/objlist.list `)
-ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJLinAlg)
- 
+OBJXAstroPack = $(shell echo `cat ./XAstroPack/objlist.list `)
+ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJLinAlg) $(OBJXAstroPack)
+
 # List of .o files for PI modules 
 OBJPI = $(shell echo `cat ./PI/objlist.list `)

trunk/SophyaLib/Mgr/README

@@ -19 +19 @@
 * LinAlg/        Interface with Lapack linear algebra package
 * IFFTW/         Interface with FFTW package
+* XAstroPack/    Interface with astronomy library (XEphem)
+                 Code is into the SOPHYA module XephemAstroLib
 
 

trunk/SophyaLib/Mgr/extlibdirs

@@ -2 +2 @@
 IFFTW
 LinAlg
+XAstroPack

trunk/SophyaLib/Mgr/makefileuser.inc

@@ -35 +35 @@
 #--------- lib sophya interface externes ---------
 ifndef NOEXTLIB
-LIBF := $(LIBF) $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a
-LIBS := $(LIBS) -lFitsIOServer -lIFFTW -lLinAlg
+LIBF := $(LIBF) $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a $(LIB)libXAstroPack.a
+LIBS := $(LIBS) -lFitsIOServer -lIFFTW -lLinAlg -lXAstroPack
 #LIBF := $(LIBF)libBlitz.a
 #LIBS := $(LIBS) -lBlitz
@@ -49 +49 @@
 #--------- Other Extern Libraries ---------
 ifndef NOEXTLIB
-ELIBF := $(ELIBF) $(EXTLIBPATH)libcfitsio.a $(EXTLIBPATH)libfftw.a $(EXTLIBPATH)librfftw.a
-ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw
+ELIBF := $(ELIBF) $(EXTLIBPATH)libcfitsio.a $(EXTLIBPATH)libfftw.a $(EXTLIBPATH)librfftw.a $(EXTLIBPATH)libxastro.a
+ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw -lxastro
 ifeq ($(MACHEROS),OSF1)
 ELIBS := $(ELIBS) -ldxml
@@ -104 +104 @@
 # on pourrait appeller les blabla.so (EXTSLBPATH) si on les avait crees
 ifndef NOEXTLIB
-ELIBF := $(ELIBF) $(EXTLIBPATH)libcfitsio.a $(EXTLIBPATH)libfftw.a $(EXTLIBPATH)librfftw.a
-ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw
+ELIBF := $(ELIBF) $(EXTLIBPATH)libcfitsio.a $(EXTLIBPATH)libfftw.a $(EXTLIBPATH)librfftw.a $(EXTLIBPATH)libxastro.a
+ELIBS := $(ELIBS) -L$(EXTLIBPATH) -lcfitsio -lfftw -lrfftw  -lxastro
 ifeq ($(MACHEROS),OSF1)
 ELIBS := $(ELIBS) -ldxml

trunk/SophyaLib/Mgr/mkslbsgi.csh

@@ -25 +25 @@
 set EXTSLBPL = -L${EXTLIBDIR}/IRIX64-CC/ShLibs/
 
-set EXTLIBL  = "${EXTLIBPL} -lcfitsio -lfftw -lrfftw "
-set EXTSLBL  = "${EXTSLBPL} -lcfitsio -lfftw "
+set EXTLIBL  = "${EXTLIBPL} -lcfitsio -lfftw -lrfftw -lxastro"
+set EXTSLBL  = "${EXTSLBPL} -lcfitsio -lfftw -lrfftw -lxastro"
 
 
@@ -41 +41 @@
 set OBJIFFTW = `cat ./IFFTW/objlist.list `
 set OBJLinAlg = `cat ./LinAlg/objlist.list `
-set ALLEXTOBJS = ( $OBJFitsIOServer $OBJIFFTW $OBJLinAlg )
+set OBJXAstroPack = `cat ./XAstroPack/objlist.list `
+set ALLEXTOBJS = ( $OBJFitsIOServer $OBJIFFTW $OBJLinAlg $OBJXAstroPack )
 
 set OBJPI = `cat ./PI/objlist.list `