Changeset 1604 in Sophya for trunk/SophyaLib/Mgr


Ignore:
Timestamp:
Jul 30, 2001, 6:51:50 PM (24 years ago)
Author:
cmv
Message:

Adaptation des scripts a la restructuration base CVS (creation modules BaseTools et Utils) cmv+Reza 30/7/2001

Location:
trunk/SophyaLib/Mgr
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/Mgr/Makefile

    r1472 r1604  
    44include Mgr/Makefile.slb
    55
    6 LIBF =  $(LIB)libSysTools.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a
    7 LIBS = -L$(LIB) -lSysTools -lTArray -lNTools -lHiStats -lSkyMap -lSamba -lSkyT
     6LIBF =  $(LIB)libBaseTools.a $(LIB)libSysTools.a $(LIB)libUtils.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a
     7LIBS = -L$(LIB) -lBaseTools -lSysTools -lUtils -lTArray -lNTools -lHiStats -lSkyMap -lSamba -lSkyT
    88
    99defaut: libs
    … …  
    1515extlibs: cxxextlibs
    1616
    17 cxxlibs:  SysTools TArray NTools HiStats SkyMap Samba SkyT
     17cxxlibs:  BaseTools SysTools Utils TArray NTools HiStats SkyMap Samba SkyT
    1818
    1919cxxextlibs:  FitsIOServer IFFTW LinAlg XAstroPack
    … …  
    3939#--------------------------------------------------------------------
    4040
     41.PHONY:  BaseTools
     42BaseTools:
     43        if [ -d BaseTools ] ; then cd  BaseTools ; $(MAKE) ; fi
     44
    4145.PHONY:  SysTools
    4246SysTools:
    4347        if [ -d SysTools ] ; then cd  SysTools ; $(MAKE) ; fi
     48
     49.PHONY:  Utils
     50Utils:
     51        if [ -d Utils ] ; then cd  Utils ; $(MAKE) ; fi
    4452 
    4553.PHONY:  TArray
    … …  
    9098 
    9199#  List of libraries (.a)
    92 PSLB =  $(LIB)libSysTools.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a
     100PSLB =  $(LIB)libBaseTools.a $(LIB)libSysTools.a $(LIB)libUtils.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a
    93101EXTPSLB =  $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a $(LIB)libXAstroPack.a
    94102PIPSLB =  $(LIB)libPI.a  $(LIB)libPIext.a
    … …  
    131139 
    132140# List of .o files for each module
     141OBJBaseTools = $(shell echo `cat ./BaseTools/objlist.list `)
    133142OBJSysTools = $(shell echo `cat ./SysTools/objlist.list `)
     143OBJUtils = $(shell echo `cat ./Utils/objlist.list `)
    134144OBJTArray = $(shell echo `cat ./TArray/objlist.list `)
    135145OBJNTools = $(shell echo `cat ./NTools/objlist.list `)
    … …  
    138148OBJSamba = $(shell echo `cat ./Samba/objlist.list `)
    139149OBJSkyT = $(shell echo `cat ./SkyT/objlist.list `)
    140 ALLOBJS = $(OBJSysTools) $(OBJTArray) $(OBJNTools) $(OBJHiStats) $(OBJSkyMap) $(OBJSamba) $(OBJSkyT)
     150ALLOBJS = $(OBJBaseTools) $(OBJSysTools) $(OBJUtils) $(OBJTArray) $(OBJNTools) $(OBJHiStats) $(OBJSkyMap) $(OBJSamba) $(OBJSkyT)
    141151 
    142152# List of .o files modules with reference to external libraries

  • trunk/SophyaLib/Mgr/Makefile.am

    r1271 r1604  
    1 SUBDIRS = include SysTools TArray HiStats NTools SkyMap Samba SkyT
     1SUBDIRS = include BaseTools SysTools Utils TArray HiStats NTools SkyMap Samba SkyT
    22

  • trunk/SophyaLib/Mgr/README

    r1455 r1604  
    77
    88* Mgr/           Scripts for code management and makefiles
    9 * SysTools/      General architecture support classes
     9* BaseTools/     General architecture support classes
     10* SysTools/      Interface to various services provided by the operating system
     11* Utils/         Utility classes and functions
    1012* TArray/        Template numerical arrays, vectors and matrices
    1113* SkyMap/        Local and full sky maps
    … …  
    2931* PrgUtil/       Utility main programs
    3032
     33* PrgMap/        Utility main programs for sky map manipulation
     34
    3135
    3236* PI/            GUI class library
    … …  
    4347Operating system            Compiler
    4448......................................................................
    45 Compaq/DEC OSF 4.0           cxx 6.1         (shared-library only)
     49Compaq/DEC OSF 4.0           cxx 6.x         (shared-library only)
    4650Compaq/DEC OSF 4.0           g++ 2.95        (shared-library only)
    4751SGI                          CC  7.30        (   "    "      "   )

  • trunk/SophyaLib/Mgr/configure.in

    r1272 r1604  
    4545AC_CHECK_FUNCS(nice)
    4646
    47 cp $srcdir/SysTools/machdefs_ac.h machdefs.h
     47cp $srcdir/BaseTools/machdefs_ac.h machdefs.h
    4848
    4949
    … …  
    6161
    6262
    63 for xdir in SysTools TArray HiStats NTools SkyMap Samba SkyT; do
     63for xdir in BaseTools SysTools Utils TArray HiStats NTools SkyMap Samba SkyT; do
    6464  if test -d $incsrcdir/$xdir ; then
    6565     for fn in $incsrcdir/$xdir/*.h; do
    … …  
    7171cd ..
    7272
    73 AC_OUTPUT(Makefile include/Makefile SysTools/Makefile TArray/Makefile
     73AC_OUTPUT(Makefile include/Makefile BaseTools/Makefile SysTools/Makefile
     74                   Utils/Makefile   TArray/Makefile
    7475                   HiStats/Makefile NTools/Makefile   SkyMap/Makefile
    7576                   Samba/Makefile   SkyT/Makefile)

  • trunk/SophyaLib/Mgr/makefileuser.inc

    r1472 r1604  
    2929
    3030#--------- lib sophya ---------
    31 LIBF := $(LIBF) $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libTArray.a $(LIB)libHiStats.a
     31LIBF := $(LIBF) $(LIB)libBaseTools.a $(LIB)libSysTools.a $(LIB)libUtils.a $(LIB)libNTools.a $(LIB)libTArray.a $(LIB)libHiStats.a
    3232LIBF := $(LIBF) $(LIB)libSamba.a $(LIB)libSkyMap.a $(LIB)libSkyT.a
    33 LIBS := $(LIBS) -L$(LIB) -lSysTools -lNTools -lTArray -lHiStats -lSamba -lSkyMap -lSkyT
     33LIBS := $(LIBS) -L$(LIB) -lBaseTools -lSysTools -lUtils -lNTools -lTArray -lHiStats -lSamba -lSkyMap -lSkyT
    3434
    3535#--------- lib sophya interface externes ---------

  • trunk/SophyaLib/Mgr/mkslbsgi.csh

    r1594 r1604  
    2929
    3030
     31set OBJBaseTools = `cat ./BaseTools/objlist.list `
    3132set OBJSysTools = `cat ./SysTools/objlist.list `
     33set OBJUtils = `cat ./Utils/objlist.list `
    3234set OBJTArray = `cat ./TArray/objlist.list `
    3335set OBJNTools = `cat ./NTools/objlist.list `
    … …  
    3638set OBJSamba = `cat ./Samba/objlist.list `
    3739set OBJSkyT = `cat ./SkyT/objlist.list `
    38 set ALLOBJS = ($OBJSysTools $OBJTArray $OBJNTools  $OBJHiStats  $OBJSkyMap $OBJSamba $OBJSkyT)
     40set ALLOBJS = ($OBJBaseTools $OBJSysTools $OBJUtils $OBJTArray $OBJNTools  $OBJHiStats  $OBJSkyMap $OBJSamba $OBJSkyT)
    3941       
    4042set OBJFitsIOServer = `cat ./FitsIOServer/objlist.list `
Note: See TracChangeset for help on using the changeset viewer.