Changeset 2910 in Sophya for trunk/SophyaLib

Timestamp:

Jan 17, 2006, 2:32:13 PM (20 years ago)

Author:

cmv

Message:

Variables pour tenir compte des lib archive Sophya+PI cmv 17/01/2006

Location:

trunk/SophyaLib/BuildMgr

Files:

• AIX_xlC_make.inc (modified) (1 diff)
• Darwin_g++_make.inc (modified) (1 diff)
• IRIX64_CC_make.inc (modified) (1 diff)
• Linux_g++_make.inc (modified) (1 diff)
• Linux_icc_make.inc (modified) (1 diff)
• OSF1_cxx_make.inc (modified) (1 diff)
• configure (modified) (4 diffs)

trunk/SophyaLib/BuildMgr/AIX_xlC_make.inc

@@ -51 +51 @@
 
 # --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/Darwin_g++_make.inc

@@ -45 +45 @@
 LIBFORT = 
 
-# --- Chemin pour l'ensemble les librairies SOPHYA , +ExtLibs, +PI
+# --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/IRIX64_CC_make.inc

@@ -45 +45 @@
 
 # --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/Linux_g++_make.inc

@@ -43 +43 @@
 
 # --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/Linux_icc_make.inc

@@ -44 +44 @@
 
 # --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/OSF1_cxx_make.inc

@@ -43 +43 @@
 
 # --- Chemin pour l ensemble les librairies SOPHYA , +ExtLibs, +PI
+SOPHYALIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST)  $(SOPBASELIBS)
+SOPHYAEXTLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPEXTLIBS) $(SOPBASELIBS)
+SOPHYAALLLIBLIST = -L$(SOPHYALIBP) $(SOPMODLIBLIST) $(SOPPILIBLIST) $(PILIBS) $(SOPEXTLIBS) $(SOPBASELIBS)
+
 SOPHYASLBLIST = -L$(SOPHYASLBP) -lsophya  $(SOPBASELIBS)
 SOPHYAEXTSLBLIST = -L$(SOPHYASLBP) -lextsophya -lsophya $(SOPEXTLIBS) $(SOPBASELIBS)

trunk/SophyaLib/BuildMgr/configure

@@ -7 +7 @@
 #----------------------------------------------------------------------
 #### liste des modules
+set SOPMODOK = ( 1 1 1 1 1 1 1 1 1 )
 set SOPMOD = ( BaseTools SysTools SUtils TArray NTools HiStats SkyMap Samba SkyT )
+set ALLSOPLIBS = ( '-lBaseTools' '-lSysTools' '-lSUtils' '-lTArray' '-lNTools' '-lHiStats' '-lSkyMap' '-lSamba' '-lSkyT' )
+
+set SOPPIOK = ( 1 1 1 )
 set SOPPI = ( PI PIext PIGcont )
+set ALLPILIBS = ( '-lPI' '-lPIext' '-lPIGcont' )
 
 set SOPEXT     = ( FitsIOServer  IFFTW  LinAlg  XAstroPack  MinuitAdapt )
@@ -231 +236 @@
 #### liens des librairies externes
 echo " "
-echo ">>>>>> 4/  External libraries "
+echo ">>>>>> 4.1/  External libraries "
 set fpath = $TMPDIR/fpath
 rm -f $fpath; touch $fpath
@@ -264 +269 @@
 
 #----------------------------------------------------------------------
+#### Identification des librairies archives Sophya
+echo " "
+echo ">>>>>> 4.2/  Sophya libraries archives "
+set sopmodlib
+set i = 0
+while ( $i < $#SOPMOD )
+  @ i += 1
+  if( $SOPMODOK[$i] <= 0 ) continue
+  if( -d ../$SOPMOD[$i] ) then
+    set sopmodlib = ( $sopmodlib $ALLSOPLIBS[$i] )
+  else
+    echo "WARNING: module "$SOPMOD[$i]" not found"
+  endif
+end
+echo sopmodlib= $sopmodlib
+
+echo " "
+echo ">>>>>> 4.3/  PI-Sophya libraries archives "
+set soppilib
+set i = 0
+while ( $i < $#SOPPI )
+  @ i += 1
+  if( $SOPPIOK[$i] <= 0 ) continue
+  if( -d ../$SOPPI[$i] ) then
+    set soppilib = ( $soppilib $ALLPILIBS[$i] )
+  else
+    echo "WARNING: module "$SOPPI[$i]" not found"
+  endif
+end
+echo soppilib= $soppilib
+
+#----------------------------------------------------------------------
 #### Generation de sophyamake.inc
 #  On le cree dans le repertoire temporaire d'abord 
@@ -286 +323 @@
 
 echo " " >> $mfile 
+echo "# module libraries  " >> $mfile
+echo "SOPMODLIBLIST = $sopmodlib" >> $mfile
+
+echo " " >> $mfile 
 echo "# External libraries PATH  " >> $mfile
 echo "SOPEXTLIBP = $extlibpath"  >> $mfile
 echo "SOPEXTLIBLIST = $extliblib" >> $mfile
+
+echo " " >> $mfile 
+echo "# PI libraries  " >> $mfile
+echo "SOPPILIBLIST = $soppilib" >> $mfile
 
 echo " " >> $mfile