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

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.slb (modified) (3 diffs)

trunk/SophyaLib/Mgr/Makefile.slb

@@ -2 +2 @@
 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
@@ -117 +121 @@
 OBJSysTools = $(shell echo `cat ./SysTools/SysTools.o.list`)
 OBJNTools = $(shell echo `cat ./NTools/NTools.o.list`)
-OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
+# OBJBlitz = $(shell echo `cat ./Blitz/Blitz.o.list`)
 OBJSamba = $(shell echo `cat ./Samba/Samba.o.list`)
+OBJSkyT = $(shell echo `cat ./SkyT/SkyT.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`)
+
+ifdef CFITSIODIR
+AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) $(OBJFitsIOServer)
+else
+AllObjs := $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJSkyT) 
+endif
 
 # Creation des librairies partagees
@@ -131 +142 @@
         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)