Changeset 663 in Sophya for trunk/SophyaLib/Mgr


Ignore:
Timestamp:
Nov 29, 1999, 1:48:11 PM (26 years ago)
Author:
ansari
Message:

Preparation pour tag V_Oct99 , Reza 29/11/99

Location:
trunk/SophyaLib/Mgr
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/Mgr/Makefile

    r510 r663  
    11include Mgr/Makefile.h
    2 LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libFitsIOServer.a
    3 LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lFitsIOServer -lm
     2LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libFitsIOServer.a
     3LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lSkyT -lFitsIOServer -lm
    44LIBG = -L$(GLB) -lstdc++
    55ifeq ($(HOSTTYPE), powerpc)
    … …  
    1616# pour instantiation automatique/manuels
    1717
    18 cxxlibs: Blitz SysTools NTools Samba FitsIOServer
    19 
     18cxxlibs: FitsIOServer SkyT Samba NTools SysTools Blitz
     19
     20.PHONY:  FitsIOServer
     21FitsIOServer:
     22        if [ -d FitsIOServer ] ; then cd  FitsIOServer ; $(MAKE) ; fi
     23 
     24.PHONY:  SkyT
     25SkyT:
     26        if [ -d SkyT ] ; then cd  SkyT ; $(MAKE) ; fi
     27 
     28.PHONY:  Samba
     29Samba:
     30        if [ -d Samba ] ; then cd  Samba ; $(MAKE) ; fi
     31 
     32.PHONY:  NTools
     33NTools:
     34        if [ -d NTools ] ; then cd  NTools ; $(MAKE) ; fi
     35 
     36.PHONY:  SysTools
     37SysTools:
     38        if [ -d SysTools ] ; then cd  SysTools ; $(MAKE) ; fi
     39 
    2040.PHONY:  Blitz
    2141Blitz:
    2242        if [ -d Blitz ] ; then cd  Blitz ; $(MAKE) ; fi
    23  
    24 .PHONY:  SysTools
    25 SysTools:
    26         if [ -d SysTools ] ; then cd  SysTools ; $(MAKE) ; fi
    27  
    28 .PHONY:  NTools
    29 NTools:
    30         if [ -d NTools ] ; then cd  NTools ; $(MAKE) ; fi
    31  
    32 .PHONY:  Samba
    33 Samba:
    34         if [ -d Samba ] ; then cd  Samba ; $(MAKE) ; fi
    35  
    36 .PHONY:  FitsIOServer
    37 FitsIOServer:
    38         if [ -d FitsIOServer ] ; then cd  FitsIOServer ; $(MAKE) ; fi
    3943 
    4044.PHONY: PI
    … …  
    4549ifndef NOSHLIB
    4650
    47 PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a
     51ifdef CFITSIODIR
     52PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libFitsIOServer.a
     53else
     54PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a
     55endif
    4856slb : $(SLB)libtools.so
    4957slbpi: slb $(SLB)libPI.so
    … …  
    106114    override USECXX4SO := N
    107115  endif
    108 #  Attention - Dangereux de mettre -expect_unresolved , $CHECK$  Reza 20/10/99
    109   override CMDSHLCXX := $(LINK.cc) -shared -expect_unresolved '*'
     116#  Attention - Dangereux de mettre -expect_unresolved , enleve  Reza 17/11/99
     117  override CMDSHLCXX := $(LINK.cc) -shared
    110118  override FGSHLACXX :=
    111119  override FGSHLNCXX :=
    … …  
    158166
    159167# Liste des .o associes a une librairie
    160 OBJSysTools = $(shell echo `cat ./SysTools/SysTools.o.list`)
    161 OBJNTools = $(shell echo `cat ./NTools/NTools.o.list`)
    162 OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
    163 OBJSamba = $(shell echo `cat ./Samba/Samba.o.list`)
    164 OBJFitsIOServer = $(shell echo `cat ./FitsIOServer/FitsIOServer.o.list`)
    165 OBJPI         = $(shell echo `cat ./PI/PI.o.list`)
    166 OBJPIext      = $(shell echo `cat ./PIext/PIext.o.list`)
     168OBJSysTools = $(shell echo `cat ./SysTools/objlist.list`)
     169OBJNTools = $(shell echo `cat ./NTools/objlist.list`)
     170# OBJBlitz = $(shell echo `cat ./Blitz/objlist.list`)
     171OBJSamba = $(shell echo `cat ./Samba/objlist.list`)
     172OBJSkyT = $(shell echo `cat ./SkyT/objlist.list`)
     173OBJFitsIOServer = $(shell echo `cat ./FitsIOServer/objlist.list`)
     174OBJPI         = $(shell echo `cat ./PI/objlist.list`)
     175OBJPIext      = $(shell echo `cat ./PIext/objlist.list`)
     176
     177ifdef CFITSIODIR
     178AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) $(OBJFitsIOServer)
     179else
     180AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT)
     181endif
    167182
    168183# Creation des librairies partagees
    … …  
    174189        cd $(OBJ); \
    175190        $(CMDSHLCXX) -o $(SLB)libtools.so \
    176         $(FGSHLACXX) $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJFitsIOServer) $(OBJBlitz) $(TILSHL) \
    177         $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)   $(FITSIOLIB)
     191        $(FGSHLACXX) $(AllObjs) $(TILSHL) \
     192        $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)  $(FITSIOLIB)
    178193
    179194

  • trunk/SophyaLib/Mgr/Makefile.slb

    r595 r663  
    22ifndef NOSHLIB
    33
    4 PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a
     4ifdef CFITSIODIR
     5PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libFitsIOServer.a
     6else
     7PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a
     8endif
    59slb : $(SLB)libtools.so
    610slbpi: slb $(SLB)libPI.so
    … …  
    117121OBJSysTools = $(shell echo `cat ./SysTools/SysTools.o.list`)
    118122OBJNTools = $(shell echo `cat ./NTools/NTools.o.list`)
    119 OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
     123# OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
    120124OBJSamba = $(shell echo `cat ./Samba/Samba.o.list`)
     125OBJSkyT = $(shell echo `cat ./SkyT/SkyT.o.list`)
    121126OBJFitsIOServer = $(shell echo `cat ./FitsIOServer/FitsIOServer.o.list`)
    122127OBJPI         = $(shell echo `cat ./PI/PI.o.list`)
    123128OBJPIext      = $(shell echo `cat ./PIext/PIext.o.list`)
     129
     130ifdef CFITSIODIR
     131AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) $(OBJFitsIOServer)
     132else
     133AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT)
     134endif
    124135
    125136# Creation des librairies partagees
    … …  
    131142        cd $(OBJ); \
    132143        $(CMDSHLCXX) -o $(SLB)libtools.so \
    133         $(FGSHLACXX) $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJFitsIOServer) $(OBJBlitz) $(TILSHL) \
    134         $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)   $(FITSIOLIB)
     144        $(FGSHLACXX) $(AllObjs) $(TILSHL) \
     145        $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)  $(FITSIOLIB)
    135146
    136147

  • trunk/SophyaLib/Mgr/crerep_peida

    r218 r663  
    3636
    3737foreach d ( ${dirl}/${diru} \
    38             ${dirl}/Include ${dirl}/Include/tnt \
     38            ${dirl}/Include \
    3939            ${dirl}/${diru}/Exec \
    4040            ${dirl}/${diru}/Libs ${dirl}/${diru}/ShLibs \

  • trunk/SophyaLib/Mgr/install_peida

    r599 r663  
    11#!/bin/csh
    2 #  Script d'installation PEIDA
     2#  Script d'installation SOPHYA
    33#  Version preliminaire - Reza 27/11/97 +cmv
    44
    … …  
    6464  set SRC = $srcdir/$macomp
    6565  set DST = $dstdir/$macomp
    66   echo "************** PEIDA_Install script : ****************** "
     66  echo "************** SOPHYA_Install script : ****************** "
    6767  echo "copie de $srcdir"
    6868  echo "      vers $dstdir pour $macomp"
    … …  
    7777# d'abord les includes
    7878#foreach d ( Include Include/tnt Include/CInc Include/SystCxx Include/Syst )
    79 foreach d ( Include Include/tnt Include/CInc Include/Syst )
    80   echo "PEIDA_Install: Installing $d ... "
     79foreach d ( Include )
     80  echo "SOPHYA_Install: Installing $d ... "
    8181  if( ! -e $srcdir/$d ) then
    8282    echo "rep. inexistant: $SRC/$d"
    … …  
    9292# puis le reste
    9393foreach d ( Libs ShLibs Exec )
    94   echo "PEIDA_Install: Installing $d ... "
     94  echo "SOPHYA_Install: Installing $d ... "
    9595  if( ! -e $SRC/$d ) then
    9696    echo "rep. inexistant: $SRC/$d"
    … …  
    9999  else
    100100    if( "$d" == "Exec" ) then
    101       foreach f ( tobjio tspm tspm2 piapp )
     101      foreach f ( tobjio tspm tspm2 piapp tgsky tgrsr skymixer )
    102102        if( -e $SRC/$d/$f ) then
    103103          $DO cp $SRC/$d/$f $DST/$d/.
    … …  
    113113end
    114114
    115 echo 'PEIDA_Install complete'
     115echo 'SOPHYA_Install complete'
    116116
    117117exit 0

  • trunk/SophyaLib/Mgr/libdirs

    r478 r663  
    22NTools
    33Samba
     4SkyT
    45FitsIOServer

  • trunk/SophyaLib/Mgr/mkmf

    r554 r663  
    11#!/bin/csh
    2 # $Id: mkmf,v 1.5 1999-11-09 11:13:13 ansari Exp $
     2# $Id: mkmf,v 1.6 1999-11-29 12:48:11 ansari Exp $
    33
    44# Librairie cfitsio
    … …  
    3838# pour instantiation automatique/manuels
    3939
    40 cxxlibs: Blitz SysTools NTools Samba FitsIOServer
     40cxxlibs: FitsIOServer SkyT Samba NTools SysTools Blitz
    4141
    4242EOF
    … …  
    4444
    4545#  Attention, ne pas changer l'ordre de libnames dependances cxx
    46 set libnames = (Blitz SysTools NTools Samba FitsIOServer)
     46set libnames = (FitsIOServer SkyT Samba NTools SysTools Blitz )
    4747set i = 1
    4848set j = $#libnames ; @ j--
    … …  
    7171endif
    7272if ( -d ../PIext ) then
    73   set cmd = './mkmfPI PIext SysTools NTools PI'
     73  set cmd = './mkmfPI PIext SysTools NTools Samba SkyT PI'
    7474  echo "mkmf: Creation makefile lib PIext"
    7575  echo "   execution $cmd"
Note: See TracChangeset for help on using the changeset viewer.