Changeset 2766 in Sophya for trunk/SophyaLib/BuildMgr


Ignore:
Timestamp:
May 25, 2005, 6:58:39 PM (20 years ago)
Author:
ansari
Message:

Gestion variable controle template CXXTEMPFLG - cmv+Reza 25/5/2005

Location:
trunk/SophyaLib/BuildMgr
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r2751 r2766  
    1717CXX =  c++
    1818CXXFLAGS = -fno-common -g -fastf -mtune=G4 -fPIC
    19 CXXREP =
     19# flags specifiques pour templates repository...
     20CXXTEMPFLG =
    2021#  Compilo fortran
    2122FC = g77
    … …  
    2930CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c
    3031CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
    31 CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    32 CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    3332FCCOMPILE = $(FC) $(FFLAGS) -c
    3433
    … …  
    3635SLEXT = dylib
    3736#  Fabrication de librairies partagees
    38 CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -dynamiclib
     37CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXTEMPFLG) -dynamiclib
    3938
    4039

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

    r2751 r2766  
    1717CXX =  g++
    1818CXXFLAGS = -Wall -Wpointer-arith -Wmissing-prototypes -Wsynth -O -g
    19 CXXREP =
     19# flags specifiques pour templates repository...
     20CXXTEMPFLG =
    2021#  Compilo fortran
    2122FC = g77
    … …  
    2930CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c
    3031CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
    31 CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    32 CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    3332FCCOMPILE = $(FC) $(FFLAGS) -c
    3433
    … …  
    3635SLEXT = so
    3736#  Fabrication de librairies partagees
    38 CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -shared
     37CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXTEMPFLG) -shared
    3938
    4039

  • trunk/SophyaLib/BuildMgr/Makefile

    r2763 r2766  
    7070        if [ -d $(SOPHYALIBP) ] ; then cd $(SOPHYALIBP)/. ; rm -f *.a  ; fi
    7171        if [ -d $(SOPHYASLBP) ] ; then cd $(SOPHYASLBP)/. ; rm -f *.so ; fi
    72         if [ -d $(SOPHYAOBJP) ] ; then cd $(SOPHYAOBJP)/. ; rm -f *.o  rm -rf cxxrep* ; fi
     72        if [ -d $(SOPHYAOBJP) ] ; then cd $(SOPHYAOBJP)/. ; rm -rf *.o cxxrep ; fi
    7373

  • trunk/SophyaLib/BuildMgr/OSF1_cxx_make.inc

    r2751 r2766  
    1717CXX =  cxx
    1818CXXFLAGS = -O -pthread -g1 -no_implicit_include
    19 CXXREP =  -ptr $(SOPHYAOBJP)/cxxrep/
     19# flags specifiques pour templates repository...
     20CXXTEMPFLG = -ptr $(SOPHYAOBJP)/cxxrep/
    2021#  Compilo fortran
    2122FC = f77
    … …  
    2930CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c
    3031CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
    31 CXXCOMPILELIB = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    32 CXXCOMPILEPROG = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CXXREP) -c
    3332FCCOMPILE = $(FC) $(FFLAGS) -c
    3433
    … …  
    3635SLEXT = so
    3736#  Fabrication de librairies partagees
    38 CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXREP) -shared
     37CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXTEMPFLG) -shared
    3938
    4039

  • trunk/SophyaLib/BuildMgr/mkmflib

    r2763 r2766  
    104104       | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
    105105       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'  >> $makname
    106   echo '        $(CXXCOMPILELIB) -o $@ $<' >> $makname
     106  echo '        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@ ' $f >> $makname
    107107  echo ' ' >> $makname
    108108end
    … …  
    113113       | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
    114114       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g' >> $makname
    115   echo '        $(CCOMPILE) -o $@ $<' >> $makname
     115  echo '        $(CCOMPILE) -o $@ ' $f >> $makname
    116116  echo ' ' >> $makname
    117117end
    … …  
    120120  grep -q '^'$f'$' $exclfile && continue
    121121  echo '$(SOPHYAOBJP)'$f:r'.o: '$f >> $makname
    122   echo '        $(FCOMPILE) -o $@ $<' >> $makname
     122  echo '        $(FCOMPILE) -o $@ ' $f >> $makname
    123123  echo ' ' >> $makname
    124124end

  • trunk/SophyaLib/BuildMgr/mkmfprog

    r2751 r2766  
    9999  echo '        echo $@ " done"' >> $makname
    100100  set oo = ( `grep ^$f programs | awk -F"$f " '{print $2}'` )
    101   set dum = '$(SOPHYAEXEP)'$f':'
     101  set dum
    102102  foreach fo ( $oo )
    103103    set dum = " $dum "'$(SOPHYAOBJP)'$fo
    104104  end
    105   echo $dum  >> $makname
    106   echo '        $(CXXLINK) -o $@ $? '$lib >> $makname
     105  echo
     106  echo '$(SOPHYAEXEP)'$f':' $dum  >> $makname
     107  echo '        $(CXXLINK) $(CXXTEMPFLG) -o $@' $dum $lib >> $makname
    107108  echo ' ' >> $makname
    108109end
    … …  
    118119       | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
    119120       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'  >> $makname
    120   echo '        $(CXXCOMPILEPROG) -o $@ $<' >> $makname
     121  echo '        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@ ' $f >> $makname
    121122  echo ' ' >> $makname
    122123end
    … …  
    128129       | sed -e 's/.*\.o/\$(SOPHYAOBJP)&/'  \
    129130       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g' >> $makname
    130   echo '        $(CCOMPILE) -o $@ $<' >> $makname
     131  echo '        $(CCOMPILE) -o $@ ' $f >> $makname
    131132  echo ' ' >> $makname
    132133end
    … …  
    136137  if( $status != 0 ) continue
    137138  echo '$(SOPHYAOBJP)'$f:r'.o: '$f >> $makname
    138   echo '        $(FCOMPILE) -o $@ $<' >> $makname
     139  echo '        $(FCOMPILE) -o $@ ' $f >> $makname
    139140  echo ' ' >> $makname
    140141end
Note: See TracChangeset for help on using the changeset viewer.