Changeset 2570 in Sophya

Timestamp:

Jul 28, 2004, 12:40:57 PM (21 years ago)

Author:

ansari

Message:

Ajout -framework Accelerate qui continet LAPACK ds le makefile pour MacOSX - Reza 28 Juillet 2004

Location:

trunk/SophyaLib/Mgr

Files:

• Makefile.h (modified) (3 diffs)
• Makefile.slb (modified) (1 diff)
• makefile.darwin (modified) (4 diffs)

trunk/SophyaLib/Mgr/Makefile.h

@@ -150 +150 @@
 CC := cc
 # Pour enlever les erreurs au link des slb en -O. Pas d'avenir!
-OPTFLAG := -O
+OPTFLAG := -g
 endif
 
@@ -183 +183 @@
 ifeq (${MACHEROS},Darwin)
   XLDLIBS := -L/usr/X11R6/lib 
-  XCPPFLAGS := -I/usr/X11R6/include  
-  XCFLAGS := -fkeep-inline-functions -fno-common
+  XCPPFLAGS := -I/usr/X11R6/include -I/sw/include
+#  XCPPFLAGS := -I/usr/X11R6/include 
+  XCFLAGS := -fkeep-inline-functions -fno-common -fcoalesce
+#  XCFLAGS := -fkeep-inline-functions 
 endif
 
@@ -256 +258 @@
                   -Wmissing-prototypes -Wsynth -I$(INC) $(XCFLAGS) \
                   $(OPTFLAG) $(DBGFLAG) $(MYCFLAGS)
-  LDLIBS       := $(LDLIBS) $(XLDLIBS)
+  CXXFLAGS       := -Wall -Wpointer-arith \
+                    -Wmissing-prototypes -Wsynth -I$(INC) $(XCFLAGS) \
+                    $(OPTFLAG) $(DBGFLAG) $(MYCFLAGS) 
+  LDLIBS       := -Xlinker -bind_at_load $(LDLIBS) $(XLDLIBS)
 endif
 

trunk/SophyaLib/Mgr/Makefile.slb

@@ -21 +21 @@
 #  LIBGPP := -L/sw/lib -ldl 
    LIBGPP :=
-  LIBXPILIST := -L/usr/X11R6/lib -L/usr/local/lib  -lXm -lmotiflanginfo  -lXt -lX11 
+#  LIBXPILIST := -L/usr/X11R6/lib -L/usr/local/lib  -lXm -lmotiflanginfo  -lXt -lX11 
+  LIBXPILIST := -L/usr/X11R6/lib -L/sw/lib  -lXm  -lXt -lX11 
 endif
 

trunk/SophyaLib/Mgr/makefile.darwin

@@ -121 +121 @@
 
 # On Linux   lapack and blas and f2c/g2c ere needed
-# ifeq ($(MACHEROS),Darwin)
-# EXTLIB = $(EXTLIBL) -llapack -lblas -lg2c
-# EXTSLB = $(EXTSLBL) -llapack -lblas -lg2c
-# endif
+ifeq ($(MACHEROS),Darwin)
+EXTLIB = $(EXTLIBL) -framework Accelerate
+EXTSLB = $(EXTSLBL) -framework Accelerate
+endif
 
 # On OSF1 libdxml contains Lapack, but the fortran support library is needed
@@ -167 +167 @@
 OBJLinAlg = $(shell echo `cat ./LinAlg/objlist.list `)
 OBJXAstroPack = $(shell echo `cat ./XAstroPack/objlist.list `)
-# ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJLinAlg) $(OBJXAstroPack)
-ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJXAstroPack)
+ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJLinAlg) $(OBJXAstroPack)
+# ALLEXTOBJS = $(OBJFitsIOServer) $(OBJIFFTW) $(OBJXAstroPack)
 # ALLEXTOBJS = $(OBJFitsIOServer) 
 
@@ -196 +196 @@
         -o $(SLB)libextsophya.dylib  \
         $(FGSHLACXX) $(ALLEXTOBJS)  $(FGSHLNCXX)\
-        -L$(SLB) -lsophya $(EXTLIB) $(LIBLSHL)
+        -L$(SLB) -lsophya $(EXTLIB) $(LIBLSHL) -framework Accelerate
  
 # Building PI shared library
@@ -206 +206 @@
         -o $(SLB)libPI.dylib  \
         $(FGSHLACXX) $(ALLPIOBJS) $(FGSHLNCXX) \
-        -L$(SLB) -lextsophya -lsophya  -L/usr/X11R6/lib -lXm -lXt -lX11 
+        -L$(SLB) -lextsophya -lsophya  -L/sw/lib -lXm -L/usr/X11R6/lib  -lXt -lX11\
+        -framework Accelerate