Changeset 2392 in Sophya for trunk/ArchTOIPipe/Makefile.in

Timestamp:

May 28, 2003, 11:03:19 PM (22 years ago)

Author:

aubourg

Message:

divers pio

File:

• trunk/ArchTOIPipe/Makefile.in (modified) (12 diffs)

trunk/ArchTOIPipe/Makefile.in

@@ -16 +16 @@
 USE_PIOLIB=@use_piolib@
 
-MACHEROS := $(shell echo `uname`)
-MACHDIR := $(MACHEROS)-$(CXX)
+UNAME := $(shell echo `uname`)
+MACHDIR := $(UNAME)-$(CXX)
 
 
@@ -23 +23 @@
  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  $(LIBS)
-  ifeq ($(CXX),cxx)
-   # librairie des instances de templates cxx
-   LIBS := $(LIBS) -lrt
-  endif
- else
   LIBF =  $(SLB)libsophya.so 
   LIBS := -L$(SLB)  -lextsophya -lsophya $(LIBS)
-  ifeq ($(MACHEROS),OSF1)
+  ifeq ($(UNAME),OSF1)
    LIBS := $(LIBS) -lfor
   endif
- endif
  
  CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
@@ -48 +39 @@
 CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -DANSI 
 
-ifeq ($USE_PIOLIB,1)
-  PIOLIBS := @piolibdir@ -lpiolib
+ifeq ($(USE_PIOLIB),1)
+  PIOLIBS := -L@piolibdir@ -lpiolib
 else
   PIOLIBS :=
@@ -56 +47 @@
 LDLIBS=@cfitslibdir@ -lcfitsio $(PIOLIBS) $(LIBS) 
 
-ifeq ($(MACHEROS),IRIX64)
+ifeq ($(UNAME),IRIX64)
  ifeq ($(CXX), g++)
    LDLIBS=@cfitslibdir@ -lcfitsio -L /usr/lib32/
@@ -124 +115 @@
 # librairie compilateur GNU (g++)
 LIBGPP := -lstdc++
-ifeq ($(MACHEROS), Darwin)
+ifeq ($(UNAME), Darwin)
   LIBGPP := -L/sw/lib -ldl -L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic
 endif
@@ -172 +163 @@
 
 # Construction de shared-libs sous OSF1
-ifeq ($(MACHEROS),OSF1)
+ifeq ($(UNAME),OSF1)
   override CMDSHL := ld -shared -update_registry $(SLB)so_locations
   override FGSHLA := -all
@@ -194 +185 @@
 
 # Construction de shared-libs sous Linux
-ifeq ($(MACHEROS),Linux)
+ifeq ($(UNAME),Linux)
   override CMDSHL := ld -shared 
   override FGSHLA := --whole-archive
@@ -211 +202 @@
 
 # Construction de shared-libs sous Sun-OS
-ifeq ($(MACHEROS),SunOS)
+ifeq ($(UNAME),SunOS)
   override CMDSHL := ld -G
   override FGSHLA := -z allextract
@@ -221 +212 @@
 
 # Construction de shared-libs sous SGI
-ifeq ($(MACHEROS), IRIX64)
+ifeq ($(UNAME), IRIX64)
   override CMDSHL := ld -shared
   override FGSHLA := -all
@@ -234 +225 @@
 
 # Construction de shared-libs sous OSX
-ifeq ($(MACHEROS), Darwin)
+ifeq ($(UNAME), Darwin)
   override CMDSHL := libtool -dynamic
   override FGSHLA :=
@@ -240 +231 @@
   override TILSHL :=
   override CMDSHLCXX := libtool -dynamic
+  override FGSHLNCXX := 
 endif
 
 SLBNAME = libpipe.so
-ifeq ($(MACHEROS),Darwin)
-SLBNAME = libpipe.dylib
+ifeq ($(UNAME),Darwin)
+  SLBNAME = libpipe.dylib
 endif
 
@@ -252 +244 @@
 $(SLBNAME) : build_kernel build_processors build_sophya
         $(CMDSHLCXX) -o $(SLBNAME)  \
-        Kernel/*.o Processors/*.o ProcWSophya/*.o \
+        Kernel/*.o Processors/*.o ProcWSophya/*.o $(PIOLIBS) \
         $(FGSHLNCXX) -L$(SLB) -lsophya -lextsophya $(EXTLIB) $(LIBLSHL)
 
 
+