Changeset 2225 in Sophya

Timestamp:

Oct 23, 2002, 11:57:40 PM (23 years ago)

Author:

aubourg

Message:

v_oct02_mieux

Location:

trunk/ArchTOIPipe

Files:

• Kernel/toimanager.h (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• Processors/wienerdecor.cc (modified) (1 diff)
• TestPipes/Makefile.in (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimanager.h,v 1.16 2002-10-23 21:05:18 aubourg Exp $
+// $Id: toimanager.h,v 1.17 2002-10-23 21:57:40 aubourg Exp $
 
 
@@ -43 +43 @@
 public:
   static TOIManager* getManager();
+  virtual ~TOIManager() {}
   void setRequestedSample(int begin, int end);
   int getRequestedBegin();

trunk/ArchTOIPipe/Makefile.in

@@ -111 +111 @@
 endif
 
-
-
+### Shared libs, repris de Sophya en attendant une integration
+### plus propre a configure
+
+# librairie compilateur GNU (g++)
+LIBGPP := -lstdc++
+ifeq ($(MACHEROS), Darwin)
+  LIBGPP := -L/sw/lib -ldl -L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic
+endif
+
+#  External libraries
+EXTLIB := 
+EXTSLB := 
+
+#  Commande de construction de shared-lib 
+CMDSHL := ld -partage
+#  Flag d'inclusion/fin d'inclusion de tous les points  d'entree
+FGSHLA := -tout
+FGSHLN := -rien
+#  Librairies specifiques 
+LIBLSHL := -lpthread -lm -lc
+#  Librairie d'instanciation des templates 
+TILSHL := 
+TILSHLPI := 
+#   Commande de construction de la librairie d'instanciation des templates 
+CMDTILSHL := echo 'No Template instanciation library (.a)'
+CMDTILSHLPI  := echo 'No Template instanciation library (.a)'
+# 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 := Y
+# On utilise le compilo g++ pour la fabrication des shared libs
+ifeq ($(EROSCXX), g++)
+  override USECXX4SO := Y
+  override CMDSHLCXX := $(LINK.cc) -shared
+  override LIBLSHL := $(LIBGPP) $(LIBLSHL)
+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
+ifeq ($(MACHEROS),OSF1)
+  override CMDSHL := ld -shared -update_registry $(SLB)so_locations
+  override FGSHLA := -all
+  override FGSHLN := -none 
+#  override LIBLSHL := -lcxxstd -lcxx -lexc -lm -lc -lrt
+  override LIBLSHL := $(LIBLSHL) -lrt
+  override TILSHL := $(LIB)libertcxx.a
+  override CMDTILSHL := rm -f $(LIB)libsotcxx.a ; cd $(REP); $(AR) $(ARFLAGS) $(LIB)libso
+tcxx.a *.o
+  override TILSHLPI := $(LIB)libsotcxxpi.a
+  override CMDTILSHLPI := rm -f $(LIB)libsotcxxpi.a ; cd $(REPPI); $(AR) $(ARFLAGS) $(LIB
+)libsotcxxpi.a *.o
+  ifeq ($(CXX),g++)
+    override TILSHL := 
+    override TILSHLPI := 
+  endif
+#  Attention - Dangereux de mettre -expect_unresolved , enleve  Reza 17/11/99
+  override CMDSHLCXX :=  $(CXX) $(CXXFLAGS) -shared 
+  override FGSHLACXX := 
+  override FGSHLNCXX := 
+  override USECXX4SO := Y
+endif
+
+# Construction de shared-libs sous Linux
+ifeq ($(MACHEROS),Linux)
+  override CMDSHL := ld -shared 
+  override FGSHLA := --whole-archive
+  override FGSHLN := --no-whole-archiv
+  override CMDSHLCXX := $(LINK.cc) -shared 
+  ifeq ($(EROSCXX), KCC)
+    override CMDSHLCXX := $(LINK.cc)
+  endif
+  override FGSHLACXX := 
+  override FGSHLNCXX := 
+  override LIBLSHL := $(LIBLSHL) -ldl
+  override TILSHL := 
+  override LIBXPIPATH := -L/usr/X11/lib -L/usr/X11R6/lib
+  override LIBXPILIST := -lXm -lXt -lXext -lX11
+endif
+
+# Construction de shared-libs sous Sun-OS
+ifeq ($(MACHEROS),SunOS)
+  override CMDSHL := ld -G
+  override FGSHLA := -z allextract
+  override FGSHLN := -z weakextract
+  override TILSHL := 
+  override LIBXPIPATH := -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 TILSHL := 
+  ifeq ($(EROSCXX), CC)
+    override CMDSHLCXX := CC -shared 
+  endif
+  override LIBXPIPATH := -L/usr/X11/lib 
+  override USECXX4SO := Y
+endif
+
+# Construction de shared-libs sous OSX
+ifeq ($(MACHEROS), Darwin)
+  override CMDSHL := libtool -dynamic
+  override FGSHLA :=
+  override FGSHLN :=
+  override TILSHL :=
+  override CMDSHLCXX := libtool -dynamic
+endif
+
+SLBNAME = libpipe.so
+ifeq ($(MACHEROS),Darwin)
+SLBNAME = libpipe.dylib
+endif
+
+
+slb: $(SLBNAME)
+
+$(SLBNAME) : build_kernel build_processors build_sophya
+        $(CMDSHLCXX) -o $(SLBNAME)  \
+        Kernel/*.o Processors/*.o ProcWSophya/*.o \
+        $(FGSHLNCXX) -L$(SLB) -lsophya -lextsophya $(EXTLIB) $(LIBLSHL)
+
+

trunk/ArchTOIPipe/Processors/wienerdecor.cc

@@ +1 @@
+#include <math.h>
 #include "toimanager.h"
 #include "correl.h"
 #include "wienerdecor.h"
-#include <math.h>
 extern "C" {
 #include "nrutil.h"

trunk/ArchTOIPipe/TestPipes/Makefile.in

@@ -91 +91 @@
         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm
 
+xmlpipe: xmlpipe.o $(FILES) $(LIBDEPS)
+        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm -L$(HOME)/expat -lexpat
+
+xmlpipe.o:$(srcdir)/xmlpipe.cc
+        $(COMPILE.cc) -I$(HOME)/expat -o $@ $<
+
 %.o:$(srcdir)/%.cc
         $(COMPILE.cc) -o $@ $<