Changeset 1732 in Sophya for trunk/ArchTOIPipe/Processors

Timestamp:

Nov 5, 2001, 2:30:33 PM (24 years ago)

Author:

aubourg

Message:

nettoyage pour portabilite

Location:

trunk/ArchTOIPipe/Processors

Files:

• Makefile.in (modified) (2 diffs)
• nooppr.cc (modified) (1 diff)

trunk/ArchTOIPipe/Processors/Makefile.in

@@ -18 +18 @@
 
 ifeq ($(USE_SOPHYA),1) 
- include $(DPCBASEREP)/Include/MakefileUser.h
-
- ifdef NOSHLIB
-  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a 
-  LIBS = -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
-  ifeq ($(CXX),cxx)
-   # librairie des instances de templates cxx
-   LIBS := $(LIBS) -lrt
-  endif
- else
-  LIBF =  $(SLB)libsophya.so 
-  LIBS = -L$(SLB) -lextsophya -lsophya -lm 
-  ifeq ($(MACHEROS),OSF1)
-   LIBS := $(LIBS) -lfor
-  endif
-  ifeq ($(MACHEROS),Linux)
-#   LIBS := $(LIBS) -ldl -lf2c
-  endif
- endif
- 
+ include $(DPCBASEREP)/Include/MakefileUser.h 
  CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
- ifeq ($(CXX), cxx)
-   LIBS := $(LIBS) -pthread
- endif
- ifeq ($(MACHEROS),Linux)
-   LIBS := $(LIBS) -lpthread
- endif
 else
  ifeq ($(CXX), cxx)
   CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
-  LIBS := $(LIBS) -pthread
- endif
- ifeq ($(MACHEROS),Linux)
-   LIBS := $(LIBS) -lpthread
  endif
 endif
@@ -58 +29 @@
 CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -I$(srcdir)/../kernel -I$(srcdir)/.. -I.. -DANSI 
 
-LDLIBS=@cfitslibdir@ -lcfitsio $(LIBS)
-
 ifeq ($(MACHEROS),IRIX64)
- ifeq ($(CXX), g++)
-   LDLIBS=@cfitslibdir@ -lcfitsio -L /usr/lib32/
- endif
  ifeq ($(CXX), CC)
    CXXFLAGS = -LANG:std -woff 1171,1174,1552 -O -OPT:Olimit=0

trunk/ArchTOIPipe/Processors/nooppr.cc

@@ +1 @@
+#include <typeinfo>
 #include "toimanager.h"
 #include "nooppr.h"