Changeset 127

Timestamp:

Jul 22, 2010 5:53:14 PM (13 years ago)

Author:

toby

Message:

make more portable Mac images

File:

• trunk/fsource/Makefile (modified) (5 diffs)

trunk/fsource/Makefile

@@ -1 +1 @@
 # build the compiled fortran codes needed by GSAS-II
 
-BIN = bin
-LIBS = $(BIN)/pack_f.$(SUFFIX) $(BIN)/pyspg.$(SUFFIX) 
+BIN = ../bin
+LIBS = $(BIN)/pack_f.$(SUFFIX) $(BIN)/pyspg.$(SUFFIX) $(BIN)/polymask.$(SUFFIX) $(BIN)/histogram2d.$(SUFFIX)
 LIBSwGSAS = $(BIN)/pypowder.$(SUFFIX)
 SYMLIB := $(wildcard spsubs/*.for)
+MACFIX = \#
+MACCOPY = \#
 #----------------------------------------------------------------------
 # linux (gfortran)
+#GSASlib = ./libgsas.a
 #COMPILER=--fcompiler=gnu95 
 #PACKCOPTS=--f77flags="-fno-range-check"
@@ -17 +20 @@
 GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
 COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
-#PACKCOPTS=--f77flags="-fno-range-check -static-libgcc"
+PACKCOPTS=--f77flags="-fno-range-check"
 SUFFIX=so
 F2PY=f2py
 MOVE=mv
-DEL=echo
+DEL=\#
+MACFIX = install_name_tool -change 
+MACCOPY = cp
 #----------------------------------------------------------------------
 # windows g77
@@ -37 +42 @@
         @echo " $(LIBS) $(LIBSwGSAS)"
         @echo "   Note: target $(LIBSwGSAS) requires the GSAS object library."
-        @echo "     This is not built with make all. You will need to edit the"
+        @echo "     File $(LIBSwGSAS) is built from files that are not distributed."
+        @echo "     This is built last with make all. You may need to edit the"
         @echo "     Makefile to set GSASlib to point to the correct location."
 
-all:: $(BIN) $(LIBS)
+all:: $(BIN) $(LIBS) $(LIBSwGSAS)
 
 # OSX: note that this is building .so's that require libgfortran and 
-# libgcc_s.1 at runtime. The former can be removed by renaming the accessed 
-# libgfortran.3.dynlib. Not sure how to avoid libgcc_s.1
+# libgcc_s.1 at runtime. Based on advice from Ilan at EPD, the .so files are 
+# modified so that the libraries are placed in the same location as the .so files
 # Use otool -L <file.so> to see what is required
 #
@@ -52 +58 @@
 $(BIN)/pack_f.$(SUFFIX): pack_f.for
         $(F2PY) -c pack_f.for -m pack_f $(COMPILER) $(PACKCOPTS)
+        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pack_f.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+        $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib pack_f.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
         $(MOVE) pack_f.$(SUFFIX) $(BIN)
         $(DEL) pack_f.$(SUFFIX)
@@ -57 +67 @@
 $(BIN)/pypowder.$(SUFFIX): pypowder.for $(GSASlib)
         $(F2PY) -c pypowder.for -m pypowder $(COMPILER) $(GSASlib)
+        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pypowder.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+        $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib pypowder.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
         $(MOVE) pypowder.$(SUFFIX) $(BIN)
         $(DEL) pypowder.$(SUFFIX)
 
 $(BIN)/pyspg.$(SUFFIX): pyspg.for $(SYMLIB)
-        $(F2PY) -c pyspg.for $(SYMLIB) -m pyspg $(COMPILER) 
+        $(F2PY) -c pyspg.for $(SYMLIB) -m pyspg $(COMPILER)
+        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pyspg.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+        $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib pyspg.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
         $(MOVE) pyspg.$(SUFFIX) $(BIN)
         $(DEL) pyspg.$(SUFFIX)
+
+$(BIN)/polymask.$(SUFFIX): polymask.for $(SYMLIB)
+        $(F2PY) -c polymask.for -m polymask $(COMPILER)
+        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib polymask.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+        $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib polymask.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
+        $(MOVE) polymask.$(SUFFIX) $(BIN)
+        $(DEL) polymask.$(SUFFIX)
+
+$(BIN)/histogram2d.$(SUFFIX): histogram2d.for $(SYMLIB)
+        $(F2PY) -c histogram2d.for -m histogram2d $(COMPILER)
+        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib histogram2d.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+        $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib histogram2d.$(SUFFIX)
+        $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
+        $(MOVE) histogram2d.$(SUFFIX) $(BIN)
+        $(DEL) histogram2d.$(SUFFIX)
+
+
+# basic outline for build; change ????? and add any specific options to F2PY step
+# $(BIN)/?????.$(SUFFIX): ?????.for $(SYMLIB)
+#       $(F2PY) -c ?????.for -m ????? $(COMPILER)
+#       $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib ?????.$(SUFFIX)
+#       $(MACCOPY) /usr/local/lib/libgcc_s.1.dylib $(BIN)
+#       $(MACFIX) /usr/local/lib/libgfortran.2.dylib @loader_path/libgfortran.2.dylib ?????.$(SUFFIX)
+#       $(MACCOPY) /usr/local/lib/libgfortran.2.dylib $(BIN)
+#       $(MOVE) ?????.$(SUFFIX) $(BIN)
+#       $(DEL) ?????.$(SUFFIX)
+
 
 # no longer in use