Index: trunk/SophyaLib/Mgr/Makefile
===================================================================
--- trunk/SophyaLib/Mgr/Makefile	(revision 507)
+++ trunk/SophyaLib/Mgr/Makefile	(revision 510)
@@ -1,6 +1,9 @@
 include Mgr/Makefile.h
-LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a
-LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lm
+LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libSamba.a $(LIB)libFitsIOServer.a
+LIBS = -L$(LIB) -lSysTools -lNTools -lSamba -lFitsIOServer -lm
 LIBG = -L$(GLB) -lstdc++
+ifeq ($(HOSTTYPE), powerpc)
+  LIBG = -L$(GLB)
+endif
 
 defaut: libs
@@ -13,5 +16,5 @@
 # pour instantiation automatique/manuels
 
-cxxlibs: Blitz SysTools NTools Samba 
+cxxlibs: Blitz SysTools NTools Samba FitsIOServer
 
 .PHONY:  Blitz
@@ -31,4 +34,8 @@
 	if [ -d Samba ] ; then cd  Samba ; $(MAKE) ; fi
  
+.PHONY:  FitsIOServer
+FitsIOServer:
+	if [ -d FitsIOServer ] ; then cd  FitsIOServer ; $(MAKE) ; fi
+ 
 .PHONY: PI
 PI:
@@ -42,4 +49,6 @@
 slbpi: slb $(SLB)libPI.so
 
+#  Chemin des librairies Motifs / X11 (pour chemin non standard)
+LIBXPATH :=
 #  Commande de construction de shared-lib 
 CMDSHL := ld -partage
@@ -55,6 +64,27 @@
 CMDTILSHL := echo 'Cas Non Prevu'
 CMDTILSHLPI := echo 'Cas Non Prevu'
-#  Chemin des librairies Motifs / X11 (pour chemin non standard)
-LIBXPATH :=
+# Utilisation du compilo C++ comme driver pour fabrication des shared-libs
+CMDSHLCXX := $(LINK.cc) 
+FGSHLACXX :=  
+FGSHLNCXX := 
+#  S'il faut utiliser $(CMDSHLCXX) pour fabrication des shared-libs
+USECXX4SO := N
+# On utilise le compilo g++ pour la fabrication des shared libs
+ifeq ($(EROSCXX), g++)
+  override USECXX4SO := Y
+  override CMDSHLCXX := $(LINK.cc) -shared
+endif
+
+# On utilise le compilo KCC pour la fabrication des shared libs
+ifeq ($(EROSCXX), KCC)
+  override USECXX4SO := Y
+  override CMDSHLCXX := $(LINK.cc)
+endif
+
+# On utilise le compilo aCC (HP) pour la fabrication des shared libs
+ifeq ($(EROSCXX), aCC)
+  override USECXX4SO := Y
+  override CMDSHLCXX := $(LINK.cc) -b
+endif
 
 # Construction de shared-libs sous OSF1
@@ -74,6 +104,8 @@
     override TILSHLPI := 
     override CMDTILSHLPI := echo 'No Template instanciation library'
+    override USECXX4SO := N
   endif
-  override CMDSHLCXX := $(LINK.cc) -shared 
+#  Attention - Dangereux de mettre -expect_unresolved , $CHECK$  Reza 20/10/99
+  override CMDSHLCXX := $(LINK.cc) -shared -expect_unresolved '*' 
   override FGSHLACXX := 
   override FGSHLNCXX := 
@@ -86,4 +118,7 @@
   override FGSHLN := --no-whole-archiv
   override CMDSHLCXX := $(LINK.cc) -shared 
+  ifeq ($(EROSCXX), KCC)
+    override CMDSHLCXX := $(LINK.cc)
+  endif
   override FGSHLACXX := 
   override FGSHLNCXX := 
@@ -91,5 +126,33 @@
   override TILSHL := 
   override CMDTILSHL := echo 'No Template instanciation library'
+  override LIBXPATH := -L/usr/X11/lib -L/usr/X11R6/lib
+endif
+
+# Construction de shared-libs sous Sun-OS
+ifeq ($(MACHEROS),SunOS)
+  override CMDSHL := ld -G
+  override FGSHLA := -z allextract
+  override FGSHLN := -z weakextract
+  override LIBLSHL := $(LIBG) -lm -lc
+  override TILSHL := 
+  override CMDTILSHL := echo 'No Template instanciation library'
   override LIBXPATH := -L/usr/X11/lib
+  override USECXX4SO := Y
+endif
+
+# Construction de shared-libs sous SGI
+ifeq ($(MACHEROS), IRIX64)
+  override CMDSHL := ld -shared
+  override FGSHLA := -all
+  override FGSHLN := -notall
+  override LIBLSHL := $(LIBG) -lm -lc
+  override TILSHL := 
+  override CMDTILSHL := echo 'No Template instanciation library'
+  ifeq ($(EROSCXX), CC)
+    override CMDSHLCXX := CC -shared 
+    override LIBLSHL := -lm -lc
+  endif
+  override LIBXPATH := -L/usr/X11/lib
+  override USECXX4SO := Y
 endif
 
@@ -99,4 +162,5 @@
 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`)
@@ -110,6 +174,6 @@
 	cd $(OBJ); \
 	$(CMDSHLCXX) -o $(SLB)libtools.so \
-	$(FGSHLACXX) $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJBlitz) $(TILSHL) \
-	$(FGSHLNCXX) -L$(SLB) $(LIBLSHL)
+	$(FGSHLACXX) $(OBJSysTools) $(OBJNTools) $(OBJSamba) $(OBJFitsIOServer) $(OBJBlitz) $(TILSHL) \
+	$(FGSHLNCXX) -L$(SLB) $(LIBLSHL)   $(FITSIOLIB) 
 
 
