Changeset 2751 in Sophya for trunk/SophyaLib/BuildMgr

Timestamp:

May 20, 2005, 6:22:07 PM (20 years ago)

Author:

cmv

Message:

gestion CXXCOMPILE-LIB-PROG cmv 20/05/05

Location:

trunk/SophyaLib/BuildMgr

Files:

• Darwin_g++_make.inc (modified) (3 diffs)
• Linux_g++_make.inc (modified) (3 diffs)
• Makefile (modified) (1 diff)
• OSF1_cxx_make.inc (modified) (3 diffs)
• change_smake2make.csh (added)
• configure (modified) (3 diffs)
• mkmflib (modified) (1 diff)
• mkmfprog (modified) (1 diff)

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

@@ -17 +17 @@
 CXX =  c++
 CXXFLAGS = -fno-common -g -fastf -mtune=G4 -fPIC 
+CXXREP =
 #  Compilo fortran
 FC = g77
@@ -28 +29 @@
 CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c 
 CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c 
+CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
+CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
 FCCOMPILE = $(FC) $(FFLAGS) -c 
 
@@ -33 +36 @@
 SLEXT = dylib
 #  Fabrication de librairies partagees 
-CMDSHLCXX = $(CXX) $(CXXFLAGS) -dynamiclib 
+CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -dynamiclib 
 
 

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

@@ -17 +17 @@
 CXX =  g++
 CXXFLAGS = -Wall -Wpointer-arith -Wmissing-prototypes -Wsynth -O -g
+CXXREP =
 #  Compilo fortran
 FC = g77
@@ -28 +29 @@
 CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c 
 CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c 
+CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
+CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
 FCCOMPILE = $(FC) $(FFLAGS) -c 
 
@@ -33 +36 @@
 SLEXT = so
 #  Fabrication de librairies partagees 
-CMDSHLCXX = $(CXX) $(CXXFLAGS) -shared 
+CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -shared 
 
 

trunk/SophyaLib/BuildMgr/Makefile

@@ -11 +11 @@
         echo '*DBG* Building extlibs'
 
+DIRCONF = $(SOPHYAINCP)/SophyaConfInfo/
 
 cxxlibs:: 
-        if [ -d ../BaseTools ] ; then cd  ../BaseTools ; $(MAKE) ; fi
-        if [ -d ../SysTools ] ; then cd  ../SysTools ; $(MAKE) ; fi
-        if [ -d ../SUtils ] ; then cd  ../SUtils ; $(MAKE) ; fi
-        if [ -d ../TArray ] ; then cd  ../TArray ; $(MAKE) ; fi
-        if [ -d ../NTools ] ; then cd  ../NTools ; $(MAKE) ; fi
-        if [ -d ../HiStats ] ; then cd  ../HiStats ; $(MAKE) ; fi
-        if [ -d ../SkyMap ] ; then cd  ../SkyMap ; $(MAKE) ; fi
-        if [ -d ../Samba ] ; then cd  ../Samba ; $(MAKE) ; fi
-        if [ -d ../SkyT ] ; then cd  ../SkyT ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)BaseTools.conf ] ; then cd  ../BaseTools ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)SysTools.conf ] ; then cd  ../SysTools ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)SUtils.conf ] ; then cd  ../SUtils ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)TArray.conf ] ; then cd  ../TArray ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)NTools.conf ] ; then cd  ../NTools ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)HiStats.conf ] ; then cd  ../HiStats ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)SkyMap.conf ] ; then cd  ../SkyMap ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)Samba.conf ] ; then cd  ../Samba ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)SkyT.conf ] ; then cd  ../SkyT ; $(MAKE) ; fi
 
 cxxextlibs::  
-        if [ -d ../FitsIOServer ] ; then cd  ../FitsIOServer ; $(MAKE) ; fi
-        if [ -d ../IFFTW ] ; then cd  ../IFFTW ; $(MAKE) ; fi
-        if [ -d ../LinAlg ] ; then cd  ../LinAlg ; $(MAKE) ; fi
-        if [ -d ../XAstroPack ] ; then cd  ../XAstroPack ; $(MAKE) ; fi
-        if [ -d ../MinuitAdapt ] ; then cd  ../MinuitAdapt ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)FitsIOServer.conf ] ; then cd  ../FitsIOServer ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)IFFTW.conf ] ; then cd  ../IFFTW ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)LinAlg.conf ] ; then cd  ../LinAlg ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)XAstroPack.conf ] ; then cd  ../XAstroPack ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)MinuitAdapt.conf ] ; then cd  ../MinuitAdapt ; $(MAKE) ; fi
  
 PI::
-        if [ -d ../PI ] ; then cd ../PI ; $(MAKE) ; fi
-        if [ -d ../PIGcont ] ; then cd ../PIGcont ; $(MAKE) ; fi
-        if [ -d ../PIext ] ; then cd ../PIext ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)PI.conf ] ; then cd ../PI ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)PIGcont.conf ] ; then cd ../PIGcont ; $(MAKE) ; fi
+        if [ -f $(DIRCONF)PIext.conf ] ; then cd ../PIext ; $(MAKE) ; fi
 
 #  Shared library creation part of the Makefile
- 
+
 #  List of libraries (.a)
 PSLB =  $(SOPHYALIBP)libBaseTools.a $(SOPHYALIBP)libSysTools.a $(SOPHYALIBP)libSUtils.a $(SOPHYALIBP)libTArray.a $(SOPHYALIBP)libNTools.a $(SOPHYALIBP)libHiStats.a $(SOPHYALIBP)libSkyMap.a $(SOPHYALIBP)libSamba.a $(SOPHYALIBP)libSkyT.a

trunk/SophyaLib/BuildMgr/OSF1_cxx_make.inc

@@ -16 +16 @@
 #  Def compilateur C++ et flags
 CXX =  cxx
-CXXFLAGS = -O -pthread -g1  -ptr $(SOPHYAOBJP)/cxxrep/ -no_implicit_include
+CXXFLAGS = -O -pthread -g1 -no_implicit_include
+CXXREP =  -ptr $(SOPHYAOBJP)/cxxrep/
 #  Compilo fortran
 FC = f77
@@ -28 +29 @@
 CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c 
 CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c 
+CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
+CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c 
 FCCOMPILE = $(FC) $(FFLAGS) -c 
 
@@ -33 +36 @@
 SLEXT = so
 #  Fabrication de librairies partagees 
-CMDSHLCXX = $(CXX) $(CXXFLAGS) -shared 
+CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -shared 
 
 

trunk/SophyaLib/BuildMgr/configure

@@ -348 +348 @@
 echo " 7.a/ Creating $objlistname "
 rm -f $objlistname ; touch $objlistname
-foreach d ( $SOPMOD ) 
-  if ( -d ../$d ) then 
-    cat ../$d/objlist.list >> $objlistname
-  endif
+foreach d ( $SOPMOD )
+  rm -f $sconf/$d.conf
+  if ( ! -d ../$d ) continue 
+  cat ../$d/objlist.list >> $objlistname
+  touch $sconf/$d.conf
 end
 
@@ -360 +361 @@
 while ( $i < $#SOPEXT )
   @ i += 1
+  set d = $SOPEXT[$i]
+  rm -f $sconf/$d.conf
   if( $SOPEXTOK[$i] <= 0 ) continue
-  set d = $SOPEXT[$i]
   if ( ! -d ../$d ) continue
   cat ../$d/objlist.list >> $objlistname
+  touch $sconf/$d.conf
 end  
 
@@ -369 +372 @@
 echo " 7.c/ Creating $objlistname "
 rm -f $objlistname ; touch $objlistname
-foreach d ($SOPPI )
-  if ( -d ../$d ) then 
-    cat ../$d/objlist.list >> $objlistname
-  endif
+foreach d ( $SOPPI )
+  rm -f $sconf/$d.conf
+  if ( ! -d ../$d ) continue
+  cat ../$d/objlist.list >> $objlistname
+  touch $sconf/$d.conf
 end
 

trunk/SophyaLib/BuildMgr/mkmflib

@@ -100 +100 @@
        | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
        | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'  >> $makname
-  echo '        $(CXXCOMPILE) -o $@ $<' >> $makname
+  echo '        $(CXXCOMPILELIB) -o $@ $<' >> $makname
   echo ' ' >> $makname
 end

trunk/SophyaLib/BuildMgr/mkmfprog

@@ -118 +118 @@
        | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
        | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'  >> $makname
-  echo '        $(CXXCOMPILE) -o $@ $<' >> $makname
+  echo '        $(CXXCOMPILEPROG) -o $@ $<' >> $makname
   echo ' ' >> $makname
 end