Changeset 2739 in Sophya


Ignore:
Timestamp:
May 20, 2005, 9:28:55 AM (20 years ago)
Author:
cmv
Message:

suite nouvelle structure cmv 20/05/05

Location:
trunk
Files:
4 added
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/SophyaExt/CodeMinuit/MakeMinuit

    r2437 r2739  
    1 include $(SOPHYABASEREP)/Include/MakefileUser.h
     1include $(SOPHYABASE)/include/sophyamake.inc
    22
    33
     
    55
    66%.o: %.F
    7         $(COMPILE.f) -O -o $@ $<
     7        $(FCCOMPILE) -O -o $@ $<
    88
    99all: include libminuit.a
     
    1313
    1414include:
     15        rm -f minuit
    1516        ln -f -s ../minuit minuit
    1617
    1718clean:
    1819        rm -f $(OBJ)
    19 
    20 cleanall: clean cleantest
    2120        rm -f libminuit.a minuit
     21        rm -f ../examples/minuit ../examples/minexam ../examples/minexam.o ../examples/fcnk0.o
    2222
    2323libminuit.a : $(OBJ)
     
    2828        rm -f minuit minexam minexam.o fcnk0.o; \
    2929        ln -f -s ../minuit minuit; \
    30         $(COMPILE.f) -O -o fcnk0.o fcnk0.F; \
    31         $(COMPILE.f) -O -o minexam.o minexam.F; \
    32         $(LINK.f) -O -o minexam minexam.o fcnk0.o -L../code/ -lminuit
    33 
    34 cleantest:
    35         cd ../examples/; rm -f minuit minexam minexam.o fcnk0.o;
     30        $(FCCOMPILE) -O -o fcnk0.o fcnk0.F; \
     31        $(FCCOMPILE) -O -o minexam.o minexam.F; \
     32        $(FCLINK) -O -o minexam minexam.o fcnk0.o -L../code/ -lminuit
  • trunk/SophyaExt/CodeMinuit/Makefile

    r2437 r2739  
    1 include $(SOPHYABASEREP)/Include/MakefileUser.h
    21
    32all:
     
    98        cd code; make -f MakeMinuit clean
    109
    11 cleanall:
    12         cp MakeMinuit ./code/MakeMinuit
    13         cd code; make -f MakeMinuit cleanall
    14 
    15 install:
    16         cp ./code/libminuit.a $(EXTLIBPATH)/.
    17         if [ ! -d $(EXTINCPATH)/Cern ] ; then mkdir $(EXTINCPATH)/Cern ; fi
    18         cd $(EXTINCPATH)/Cern/.; rm -f cfortran.h minuit.h hbook.h
    19         cp ./cfortran/cfortran.h $(EXTINCPATH)/Cern/.
    20         cp ./cfortran/minuit.h $(EXTINCPATH)/Cern/.
    21         cp ./cfortran/hbook.h $(EXTINCPATH)/Cern/.
    22 
    2310test:
    2411        cp MakeMinuit ./code/MakeMinuit
  • trunk/SophyaLib/BaseTools/Makefile

    r2703 r2739  
    1 include ../Mgr/Makefile.h
     1include ../BuildMgr/sophyamake.inc
    22 
    3 all: $(LIB)libBaseTools.a
     3all: $(SOPHYALIBP)libBaseTools.a
     4 
    45clean:
    5         rm -f $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)ppfbinstream.o $(OBJ)ppftpointerio.o $(OBJ)rawstream.o $(OBJ)sophyainit.o $(OBJ)timestamp.o $(OBJ)gnumd5.o $(OBJ)srandgen.o
    6         rm -f $(LIB)libBaseTools.a
    7 $(LIB)libBaseTools.a : $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)gnumd5.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)ppfbinstream.o $(OBJ)ppftpointerio.o $(OBJ)rawstream.o $(OBJ)sophyainit.o $(OBJ)srandgen.o $(OBJ)timestamp.o
    8         $(ARCXX) $(ARCXXFLAGS) $@ $($(ARARGS))
    9 ifeq ($(CXX),cxx)
    10         $(CXX) $? $(CPPFLAGS) $(CXXFLAGS) -o $(OBJ)xx.x -Hf
    11 endif
     6         rm -f $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)timestamp.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)srandgen.o
     7        rm -f $(SOPHYALIBP)libBaseTools.a
    128 
    13 $(OBJ)datatype.o: datatype.cc sopnamsp.h datatype.h \
    14   $(INC)machdefs.h
    15 $(OBJ)dvlist.o: dvlist.cc sopnamsp.h $(INC)machdefs.h \
    16   dvlist.h objfio.h anydataobj.h ppersist.h pexceptions.h gnumd5.h \
    17   ppfbinstream.h rawstream.h ppfnametag.h mutyv.h \
    18   $(INC)strutil.h
    19 $(OBJ)fiondblock.o: fiondblock.cc sopnamsp.h \
    20   $(INC)machdefs.h pexceptions.h datatype.h \
    21   fiondblock.h ppersist.h gnumd5.h ppfbinstream.h rawstream.h \
     9$(SOPHYALIBP)libBaseTools.a : $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)srandgen.o $(SOPHYAOBJP)timestamp.o
     10        $(AR) $(ARFLAGS) $@ $?
     11 
     12$(SOPHYAOBJP)datatype.o: datatype.cc sopnamsp.h datatype.h \
     13  $(SOPHYAINCP)machdefs.h
     14        $(CXXCOMPILE) -o $@ $<
     15 
     16$(SOPHYAOBJP)dvlist.o: dvlist.cc sopnamsp.h \
     17  $(SOPHYAINCP)machdefs.h dvlist.h objfio.h \
     18  anydataobj.h ppersist.h pexceptions.h gnumd5.h ppfbinstream.h \
     19  rawstream.h ppfnametag.h mutyv.h \
     20  $(SOPHYAINCP)strutil.h
     21        $(CXXCOMPILE) -o $@ $<
     22 
     23$(SOPHYAOBJP)fiondblock.o: fiondblock.cc sopnamsp.h \
     24  $(SOPHYAINCP)machdefs.h pexceptions.h \
     25  datatype.h fiondblock.h ppersist.h gnumd5.h ppfbinstream.h rawstream.h \
    2226  ppfnametag.h ndatablock.h anydataobj.h
    23 $(OBJ)mutyv.o: mutyv.cc sopnamsp.h mutyv.h \
    24   $(INC)machdefs.h
    25 $(OBJ)ndatablock.o: ndatablock.cc sopnamsp.h \
    26   $(INC)machdefs.h pexceptions.h ndatablock.h \
     27        $(CXXCOMPILE) -o $@ $<
     28 
     29$(SOPHYAOBJP)mutyv.o: mutyv.cc sopnamsp.h mutyv.h \
     30  $(SOPHYAINCP)machdefs.h
     31        $(CXXCOMPILE) -o $@ $<
     32 
     33$(SOPHYAOBJP)ndatablock.o: ndatablock.cc sopnamsp.h \
     34  $(SOPHYAINCP)machdefs.h pexceptions.h \
     35  ndatablock.h anydataobj.h
     36        $(CXXCOMPILE) -o $@ $<
     37 
     38$(SOPHYAOBJP)pexceptions.o: pexceptions.cc sopnamsp.h pexceptions.h \
     39  $(SOPHYAINCP)machdefs.h
     40        $(CXXCOMPILE) -o $@ $<
     41 
     42$(SOPHYAOBJP)ppersist.o: ppersist.cc sopnamsp.h \
     43  $(SOPHYAINCP)machdefs.h pexceptions.h \
     44  ppersist.h gnumd5.h ppfbinstream.h rawstream.h ppfnametag.h \
    2745  anydataobj.h
    28 $(OBJ)pexceptions.o: pexceptions.cc sopnamsp.h pexceptions.h \
    29   $(INC)machdefs.h
    30 $(OBJ)ppersist.o: ppersist.cc sopnamsp.h \
    31   $(INC)machdefs.h pexceptions.h ppersist.h \
    32   gnumd5.h ppfbinstream.h rawstream.h ppfnametag.h anydataobj.h
    33 $(OBJ)ppfbinstream.o: ppfbinstream.cc sopnamsp.h \
    34   $(INC)machdefs.h ppfbinstream.h rawstream.h \
     46        $(CXXCOMPILE) -o $@ $<
     47 
     48$(SOPHYAOBJP)ppfbinstream.o: ppfbinstream.cc sopnamsp.h \
     49  $(SOPHYAINCP)machdefs.h ppfbinstream.h \
     50  rawstream.h pexceptions.h
     51        $(CXXCOMPILE) -o $@ $<
     52 
     53$(SOPHYAOBJP)ppftpointerio.o: ppftpointerio.cc \
     54  $(SOPHYAINCP)machdefs.h sopnamsp.h \
     55  ppftpointerio.h ppersist.h pexceptions.h gnumd5.h ppfbinstream.h \
     56  rawstream.h ppfnametag.h
     57        $(CXXCOMPILE) -o $@ $<
     58 
     59$(SOPHYAOBJP)rawstream.o: rawstream.cc sopnamsp.h rawstream.h \
     60  $(SOPHYAINCP)machdefs.h pexceptions.h
     61        $(CXXCOMPILE) -o $@ $<
     62 
     63$(SOPHYAOBJP)sophyainit.o: sophyainit.cc sopnamsp.h \
     64  $(SOPHYAINCP)machdefs.h sophyainit.h \
     65  pexceptions.h ppersist.h gnumd5.h ppfbinstream.h rawstream.h \
     66  ppfnametag.h fiondblock.h ndatablock.h anydataobj.h dvlist.h objfio.h \
     67  mutyv.h fiosegdb.h segdatablock.h ppftpointerio.h ppfwrapstlv.h \
     68  sversion.h
     69        $(CXXCOMPILE) -o $@ $<
     70 
     71$(SOPHYAOBJP)timestamp.o: timestamp.cc sopnamsp.h \
     72  $(SOPHYAINCP)machdefs.h timestamp.h \
    3573  pexceptions.h
    36 $(OBJ)ppftpointerio.o: ppftpointerio.cc \
    37   $(INC)machdefs.h sopnamsp.h ppftpointerio.h \
    38   ppersist.h pexceptions.h gnumd5.h ppfbinstream.h rawstream.h \
    39   ppfnametag.h
    40 $(OBJ)rawstream.o: rawstream.cc sopnamsp.h rawstream.h \
    41   $(INC)machdefs.h pexceptions.h
    42 $(OBJ)sophyainit.o: sophyainit.cc sopnamsp.h \
    43   $(INC)machdefs.h sophyainit.h pexceptions.h \
    44   ppersist.h gnumd5.h ppfbinstream.h rawstream.h ppfnametag.h \
    45   fiondblock.h ndatablock.h anydataobj.h dvlist.h objfio.h mutyv.h \
    46   fiosegdb.h segdatablock.h ppftpointerio.h ppfwrapstlv.h sversion.h
    47 $(OBJ)timestamp.o: timestamp.cc sopnamsp.h \
    48   $(INC)machdefs.h timestamp.h pexceptions.h
    49 $(OBJ)gnumd5.o: gnumd5.c $(INC)machdefs.h bithelp.h \
    50   gnumd5.h
    51 $(OBJ)srandgen.o: srandgen.c $(INC)machdefs.h \
    52   srandgen.h smathconst.h
     74        $(CXXCOMPILE) -o $@ $<
     75 
     76$(SOPHYAOBJP)gnumd5.o: gnumd5.c $(SOPHYAINCP)machdefs.h \
     77  bithelp.h gnumd5.h
     78        $(CCOMPILE) -o $@ $<
     79 
     80$(SOPHYAOBJP)srandgen.o: srandgen.c \
     81  $(SOPHYAINCP)machdefs.h srandgen.h \
     82  smathconst.h
     83        $(CCOMPILE) -o $@ $<
     84 
     85$(SOPHYAOBJP)toto.o: toto.f
     86        $(FCOMPILE) -o $@ $<
     87 
  • trunk/SophyaLib/BuildMgr/Makefile

    r2726 r2739  
    2828        if [ -d ../LinAlg ] ; then cd  ../LinAlg ; $(MAKE) ; fi
    2929        if [ -d ../XAstroPack ] ; then cd  ../XAstroPack ; $(MAKE) ; fi
     30        if [ -d ../MinuitAdapt ] ; then cd  ../MinuitAdapt ; $(MAKE) ; fi
    3031 
    3132PI::
     
    3839#  List of libraries (.a)
    3940PSLB =  $(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
    40 EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a $(SOPHYALIBP)libXAstroPack.a
    41 EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a
     41EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a $(SOPHYALIBP)libXAstroPack.a $(SOPHYALIBP)libMinuitAdapt.a
     42#EXTPSLB =  $(SOPHYALIBP)libFitsIOServer.a $(SOPHYALIBP)libIFFTW.a $(SOPHYALIBP)libLinAlg.a
    4243PIPSLB =  $(SOPHYALIBP)libPI.a $(SOPHYALIBP)libPIGcont.a $(SOPHYALIBP)libPIext.a
    4344
  • trunk/SophyaLib/BuildMgr/README

    r2720 r2739  
    66   ./mkmflib -sbase /tmp/sbase SUtils
    77
    8 3/ domkmf : c-shell script : calls mkmflib for all modules
     83/ mkmfprog : c-shell script for creation of programs module Makefile / smakefile
     9   ./mkmfprog -sbase /tmp/sbase SUtils
     10
     114/ domkmf : c-shell script : calls mkmflib for all modules
    912   ./domkmf -sbase /tmp/sbase
    1013
    11 4/ Makefile : Top level makefile for library modules
     145/ Makefile : Top level makefile for library modules
    1215
    13 5/ Configuration files :
     166/ Configuration files :
    1417   - Linux_g++_make.inc : Linux with g++ compiler
    1518   - OSF1_cxx_make.inc : (HP/Compaq/Digital Tru64 with native cxx compiler)
  • trunk/SophyaLib/BuildMgr/configure

    r2726 r2739  
    3434  echo 'configure [-sbase SOPHYABASE] [-scxx SOPHYACXX] [-incln] [-minc mymake.inc] '
    3535  echo '  [-extp dir1 -extp dir2 ...] [-extip dir1 -extip dir2 ... ] [-extlp dir1 -extlp dir2 ... ]'
    36   echo '  [-noext fits -noext fftw -noext lapack -noext astro -noext minuit]'
     36  echo '  [-noextlib -noext fits -noext fftw -noext lapack -noext astro -noext minuit]'
    3737  exit -1
    3838endif
     
    6363  set extpathlib = ( $extpathlib $2 )
    6464  shift
     65endif
     66if( "$1" == "-noextlib" ) then
     67  set i = 0
     68  while ( $i < $#SOPEXTOK )
     69    @ i += 1
     70    set SOPEXTOK[$i] = 0
     71  end 
    6572endif
    6673if( "$1" == "-noext" ) then
     
    172179        set file
    173180        foreach f ( *.h )
    174           grep "$f" excludeinc > /dev/null
     181          grep -q "$f:r\.h" excludeinc
    175182          if( $status != 0 ) set file = ( $file $f )
    176183        end
     
    350357echo " 7.b/ Creating $objlistname "
    351358rm -f $objlistname ; touch $objlistname
    352 foreach d ( $SOPEXT )
    353   if ( -d ../$d ) then
    354     cat ../$d/objlist.list >> $objlistname
    355   endif
    356 end
     359set i = 0
     360while ( $i < $#SOPEXT )
     361  @ i += 1
     362  if( $SOPEXTOK[$i] <= 0 ) continue
     363  set d = $SOPEXT[$i]
     364  if ( ! -d ../$d ) continue
     365  cat ../$d/objlist.list >> $objlistname
     366end 
    357367
    358368set objlistname = $sconf/libPI.objlist
  • trunk/SophyaLib/BuildMgr/domkmf

    r2734 r2739  
    2626end
    2727
    28 ###echo " ==== Creation smakefile pour les modules de Programmes ===="
    29 ###foreach f ( ProgPI PrgUtil PrgMap Tests PMixer )
    30 ###  set cmd = "./mkmfprog $* $f"
    31 ###  $DO $cmd
    32 ###end
     28echo " ==== Creation smakefile pour les modules de Programmes ===="
     29#foreach f ( ProgPI PrgUtil PrgMap Tests PMixer )
     30foreach f ( ProgPI PrgUtil PrgMap PMixer )
     31  set cmd = "./mkmfprog $* $f"
     32  $DO $cmd
     33end
  • trunk/SophyaLib/BuildMgr/mkdepend.csh

    r2734 r2739  
    3030       | sed -e 's?'$inc/'?$(SOPHYAINCP)?g'
    3131else
    32   echo "extension $ext not reated"
     32  echo "extension $ext not treated"
    3333endif
    3434
  • trunk/SophyaLib/BuildMgr/mkmflib

    r2734 r2739  
    33#  librairies SOPHYA 
    44#  C. Magneville / R. Ansari - Mai 2005
     5#------
     6#  Option controlant la generation des smakefile OU Makefile
     7#  smakefile utilise pour le developpement - contient une reference
     8#  a $(SOPHYABASE)/include/sophyamake.inc
     9#  les Makefile reference ../BuildMgr/sophyamake.inc
     10#------
     11
     12if ( ! $?TMPDIR ) set TMPDIR = /tmp
     13set makname = "Makefile"
     14unset targetdir
    515
    616if ( $#argv < 1) then
     
    818  exit -1
    919endif
    10 
    11 #  Option controlant la generation des smakefile OU Makefile
    12 #  smakefile utilise pour le developpement - contient une reference
    13 #  a $(SOPHYABASE)/include/sophyamake.inc
    14 #  les Makefile reference ../BuildMgr/sophyamake.inc
    15 
    16 set makname = "Makefile"
    17 unset targetdir
    1820
    1921while ( $#argv > 0 )
     
    4446cd ../$targetdir
    4547
     48#--- fichier des fichiers a exclure
    4649if ( ! -f exclude ) touch exclude
    47 if ( ! -f flags_compil ) touch flags_compil
    48 if ( ! -f extlib_list ) touch extlib_list
    49 if ( ! -f extslb_list ) touch extslb_list
    50 
    51 if ( ! $?TMPDIR ) set TMPDIR = /tmp
    52 if (-f exclude_dpc ) then
    53 #  CHECK !!! qque chose a faire ...
    54 #  On utilise alors le fichier exclude_dpc
    55   echo ' DBG - utilisation du fichier exclude_dpc pour ' $targetdir
    56   sort exclude_dpc >! $TMPDIR/exclude.sort
    57   set exclfile = 'exclude_dpc'
    58 else
    59   sort exclude >! $TMPDIR/exclude.sort
    60   set exclfile = 'exclude'
    61 endif
     50sort exclude >! $TMPDIR/exclude.sort
     51set exclfile = 'exclude'
    6252
    6353echo "mkmflib: Creating $targetdir/objlist.list , $targetdir/$makname"
    6454
    65 ##############################################
    66 ########### fichier de la liste des .o #######
    67 ##############################################
    68 
     55#--- fichier de la liste des .o
    6956set liblist = objlist.list
    7057rm -f $liblist
     
    7360unset liblist
    7461
    75 ##############################################
    76 ########### Creation de smakefile ##########
    77 ##############################################
    78 
     62#--- Creation de smakefile
    7963set libf='$(SOPHYALIBP)lib'$targetdir'.a'
    80 
    81 
    82 rm -f $makname
    83 touch $makname
     64rm -f $makname; touch $makname
    8465
    8566if ($makname == "smakefile") then
     
    8970endif
    9071
    91 echo " " >> $makname
     72echo ' ' >> $makname
    9273echo 'all:' $libf  >> $makname
    9374echo ' ' >> $makname
     
    9576echo 'clean:' >> $makname
    9677set toto='rm -f'
    97 foreach f (*.cc *.c)
     78foreach f ( *.cc *.c )
    9879  set toto= ( $toto '$(SOPHYAOBJP)'$f:r.o )
    9980end
    100 echo '  '$toto >> $makname
     81echo '  ' $toto >> $makname
    10182echo '  rm -f '$libf >> $makname
    10283echo ' ' >> $makname
     
    10990echo " " >> $makname
    11091
    111 set inc = `echo $SOPHYABASE/include | sed "s?//?/?g"`
     92
     93#--- Creation des dependances
     94set inc = `echo $SOPHYABASE/include | sed "s?//?/?g" | sed 's?/$??'`
    11295set nomsys = `uname`
    11396
     
    130113end
    131114
     115foreach f ( *.f )
     116  grep -q '^'$f'$' $exclfile && continue
     117  echo '$(SOPHYAOBJP)'$f:r'.o: '$f >> $makname
     118  echo '        $(FCOMPILE) -o $@ $<' >> $makname
     119  echo ' ' >> $makname
     120end
     121
    132122exit 0
Note: See TracChangeset for help on using the changeset viewer.