Changeset 2432 in Sophya for trunk/SophyaLib/Mgr

Timestamp:

Sep 12, 2003, 11:48:28 AM (22 years ago)

Author:

ansari

Message:

Adaptation makefile.darwin et Makefile.slb pour MacOSX 10.2 - g++ 3.1 , Reza 12/09/2003

Location:

trunk/SophyaLib/Mgr

Files:

• Makefile.slb (modified) (2 diffs)
• makefile.darwin (modified) (6 diffs)

trunk/SophyaLib/Mgr/Makefile.slb

@@ -18 +18 @@
 #endif
 ifeq ($(MACHEROS), Darwin)
-  #LIBGPP := -L/sw/lib -ldl -L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic
-  LIBGPP := -L/sw/lib -ldl -L/usr/lib/ -lstdc++ -lcc_dynamic
+#  LIBGPP := -L/sw/lib -ldl -L/usr/X11R6/lib -L/usr/local/lib -llanginfo -L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic
+  LIBGPP := -L/sw/lib -ldl 
+  LIBXPILIST := -L/usr/X11R6/lib -L/usr/local/lib  -lXm -lmotiflanginfo  -lXt -lX11 
 endif
 
@@ -126 +127 @@
 endif
 
-# Construction de shared-libs sous OSX
+# Construction de shared-libs sous Mac OSX
 ifeq ($(MACHEROS), Darwin)
+#
+#  ---- Septembre 2003 : D'apres les instructions de fink 
+# (http://fink.sourceforge.net , Documentation/Porting 
+# > cc -fno-common -c source.c
+# > cc -fno-common -c code.c
+# > cc -dynamiclib -install_name /usr/local/lib/libfoo.2.dylib \
+#       -compatibility_version 2.4 -current_version 2.4.5 \
+#       -o libfoo.2.4.5.dylib source.o code.o
+# > rm -f libfoo.2.dylib libfoo.dylib
+# > ln -s libfoo.2.4.5.dylib libfoo.2.dylib
+# > ln -s libfoo.2.4.5.dylib libfoo.dylib
+# Mis directement ds makefile.darwin -----
+#
   override CMDSHL := libtool -dynamic
   override FGSHLA :=

trunk/SophyaLib/Mgr/makefile.darwin

@@ -1 +1 @@
 # include files defining compiler/linker options 
-MODULECXXREPNAME := PI
 include Mgr/Makefile.h
 include Mgr/Makefile.slb
@@ -100 +99 @@
  
 #  List of libraries (.a)
-PSLB =  $(LIB)libBaseTools.a $(LIB)libSysTools.a $(LIB)libSUtils.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a $(LIB)libSysSpec.a
+PSLB =  $(LIB)libBaseTools.a $(LIB)libSysTools.a $(LIB)libSUtils.a $(LIB)libTArray.a $(LIB)libNTools.a $(LIB)libHiStats.a $(LIB)libSkyMap.a $(LIB)libSamba.a $(LIB)libSkyT.a 
 #EXTPSLB =  $(LIB)libFitsIOServer.a $(LIB)libIFFTW.a $(LIB)libLinAlg.a $(LIB)libXAstroPack.a
 EXTPSLB =  $(LIB)libFitsIOServer.a 
@@ -161 +160 @@
 OBJSamba = $(shell echo `cat ./Samba/objlist.list `)
 OBJSkyT = $(shell echo `cat ./SkyT/objlist.list `)
-OBJSysSpec = $(shell echo `cat ./SysSpec/objlist.list `)
-ALLOBJS = $(OBJBaseTools) $(OBJSysTools) $(OBJSUtils) $(OBJTArray) $(OBJNTools) $(OBJHiStats) $(OBJSkyMap) $(OBJSamba) $(OBJSkyT) $(OBJSysSpec) 
+ALLOBJS = $(OBJBaseTools) $(OBJSysTools) $(OBJSUtils) $(OBJTArray) $(OBJNTools) $(OBJHiStats) $(OBJSkyMap) $(OBJSamba) $(OBJSkyT)  
  
 # List of .o files modules with reference to external libraries
@@ -184 +182 @@
         $(CMDTILSHL) 
         cd  $(OBJ); \
-        $(CMDSHLCXX) -o $(SLB)libsophya.dylib  \
-        $(FGSHLACXX) $(ALLOBJS)  $(FGSHLNCXX)\
+        c++ -dynamiclib -install_name $(SLB)libsophya.dylib \
+         -compatibility_version 1.6 -current_version 1.6 \
+        -o $(SLB)libsophya.dylib  \
+        $(FGSHLACXX) $(ALLOBJS)  $(FGSHLNCXX) \
         -L$(SLB) $(LIBLSHL)
  
@@ -192 +192 @@
         $(CMDTILSHL) 
         cd  $(OBJ); \
-        $(CMDSHLCXX) -o $(SLB)libextsophya.dylib  \
+         c++ -dynamiclib -install_name $(SLB)libextsophya.dylib \
+         -compatibility_version 1.6 -current_version 1.6 \
+        -o $(SLB)libextsophya.dylib  \
         $(FGSHLACXX) $(ALLEXTOBJS)  $(FGSHLNCXX)\
         -L$(SLB) -lsophya $(EXTLIB) $(LIBLSHL)
@@ -200 +202 @@
         $(CMDTILSHL) 
         cd  $(OBJ); \
-        $(CMDSHLCXX) -o $(SLB)libPI.dylib  \
+        c++ -dynamiclib -install_name $(SLB)libPI.dylib \
+         -compatibility_version 1.6 -current_version 1.6 \
+        -o $(SLB)libPI.dylib  \
         $(FGSHLACXX) $(ALLPIOBJS) $(FGSHLNCXX) \
-        -L$(SLB) -lextsophya -lsophya -L/sw/lib -L/usr/X11R6/lib -lXm -lXt -lX11  $(LIBLSHL)
+        -L$(SLB) -lextsophya -lsophya -L/usr/local/lib -lXm -lmotiflanginfo  -L/usr/X11R6/lib -lXt -lX11