Changeset 663 in Sophya for trunk/SophyaLib/Mgr/Makefile

Timestamp:

Nov 29, 1999, 1:48:11 PM (26 years ago)

Author:

ansari

Message:

Preparation pour tag V_Oct99 , Reza 29/11/99

File:

• trunk/SophyaLib/Mgr/Makefile (modified) (6 diffs)

trunk/SophyaLib/Mgr/Makefile

@@ -1 +1 @@
 include Mgr/Makefile.h
-LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libFitsIOServer.a
-LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lFitsIOServer -lm
+LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libFitsIOServer.a
+LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lSkyT -lFitsIOServer -lm
 LIBG = -L$(GLB) -lstdc++
 ifeq ($(HOSTTYPE), powerpc)
@@ -16 +16 @@
 # pour instantiation automatique/manuels
 
-cxxlibs: Blitz SysTools NTools Samba FitsIOServer
-
+cxxlibs: FitsIOServer SkyT Samba NTools SysTools Blitz
+
+.PHONY:  FitsIOServer
+FitsIOServer:
+        if [ -d FitsIOServer ] ; then cd  FitsIOServer ; $(MAKE) ; fi
+ 
+.PHONY:  SkyT
+SkyT:
+        if [ -d SkyT ] ; then cd  SkyT ; $(MAKE) ; fi
+ 
+.PHONY:  Samba
+Samba:
+        if [ -d Samba ] ; then cd  Samba ; $(MAKE) ; fi
+ 
+.PHONY:  NTools
+NTools:
+        if [ -d NTools ] ; then cd  NTools ; $(MAKE) ; fi
+ 
+.PHONY:  SysTools
+SysTools:
+        if [ -d SysTools ] ; then cd  SysTools ; $(MAKE) ; fi
+ 
 .PHONY:  Blitz
 Blitz:
         if [ -d Blitz ] ; then cd  Blitz ; $(MAKE) ; fi
- 
-.PHONY:  SysTools
-SysTools:
-        if [ -d SysTools ] ; then cd  SysTools ; $(MAKE) ; fi
- 
-.PHONY:  NTools
-NTools:
-        if [ -d NTools ] ; then cd  NTools ; $(MAKE) ; fi
- 
-.PHONY:  Samba
-Samba:
-        if [ -d Samba ] ; then cd  Samba ; $(MAKE) ; fi
- 
-.PHONY:  FitsIOServer
-FitsIOServer:
-        if [ -d FitsIOServer ] ; then cd  FitsIOServer ; $(MAKE) ; fi
  
 .PHONY: PI
@@ -45 +49 @@
 ifndef NOSHLIB
 
-PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a 
+ifdef CFITSIODIR
+PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libFitsIOServer.a 
+else
+PSLB = $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libSkyT.a
+endif
 slb : $(SLB)libtools.so
 slbpi: slb $(SLB)libPI.so
@@ -106 +114 @@
     override USECXX4SO := N
   endif
-#  Attention - Dangereux de mettre -expect_unresolved , $CHECK$  Reza 20/10/99
-  override CMDSHLCXX := $(LINK.cc) -shared -expect_unresolved '*' 
+#  Attention - Dangereux de mettre -expect_unresolved , enleve  Reza 17/11/99
+  override CMDSHLCXX := $(LINK.cc) -shared  
   override FGSHLACXX := 
   override FGSHLNCXX := 
@@ -158 +166 @@
 
 # Liste des .o associes a une librairie
-OBJSysTools = $(shell echo `cat ./SysTools/SysTools.o.list`)
-OBJNTools = $(shell echo `cat ./NTools/NTools.o.list`)
-OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
-OBJSamba = $(shell echo `cat ./Samba/Samba.o.list`)
-OBJFitsIOServer = $(shell echo `cat ./FitsIOServer/FitsIOServer.o.list`)
-OBJPI         = $(shell echo `cat ./PI/PI.o.list`)
-OBJPIext      = $(shell echo `cat ./PIext/PIext.o.list`)
+OBJSysTools = $(shell echo `cat ./SysTools/objlist.list`)
+OBJNTools = $(shell echo `cat ./NTools/objlist.list`)
+# OBJBlitz = $(shell echo `cat ./Blitz/objlist.list`)
+OBJSamba = $(shell echo `cat ./Samba/objlist.list`)
+OBJSkyT = $(shell echo `cat ./SkyT/objlist.list`)
+OBJFitsIOServer = $(shell echo `cat ./FitsIOServer/objlist.list`)
+OBJPI         = $(shell echo `cat ./PI/objlist.list`)
+OBJPIext      = $(shell echo `cat ./PIext/objlist.list`)
+
+ifdef CFITSIODIR
+AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) $(OBJFitsIOServer)
+else
+AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) 
+endif
 
 # Creation des librairies partagees
@@ -174 +189 @@
         cd $(OBJ); \
         $(CMDSHLCXX) -o $(SLB)libtools.so \
-        $(FGSHLACXX) $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJFitsIOServer) $(OBJBlitz) $(TILSHL) \
-        $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)   $(FITSIOLIB) 
+        $(FGSHLACXX) $(AllObjs)  $(TILSHL) \
+        $(FGSHLNCXX) -L$(SLB) $(LIBLSHL)  $(FITSIOLIB)