Changeset 128

Timestamp:

Jul 22, 2010 6:01:22 PM (13 years ago)

Author:

toby

Message:

Linux build opts

File:

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

trunk/fsource/Makefile

@@ -9 +9 @@
 #----------------------------------------------------------------------
 # linux (gfortran)
-#GSASlib = ./libgsas.a
-#COMPILER=--fcompiler=gnu95 
+GSASlib = ./libgsas.a
+COMPILER=--fcompiler=gnu95 
+PACKCOPTS=--f77flags="-fno-range-check"
+SUFFIX=so
+F2PY=f2py
+MOVE=mv
+DEL= \#
+#----------------------------------------------------------------------
+# mac (gfortran)
+#GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
+#COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
 #PACKCOPTS=--f77flags="-fno-range-check"
 #SUFFIX=so
 #F2PY=f2py
 #MOVE=mv
-#DEL=echo
-#----------------------------------------------------------------------
-# mac (gfortran)
-GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
-COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
-PACKCOPTS=--f77flags="-fno-range-check"
-SUFFIX=so
-F2PY=f2py
-MOVE=mv
-DEL=\#
-MACFIX = install_name_tool -change 
-MACCOPY = cp
+#DEL=\#
+#MACFIX = install_name_tool -change 
+#MACCOPY = cp
 #----------------------------------------------------------------------
 # windows g77
@@ -53 +53 @@
 # Use otool -L <file.so> to see what is required
 #
-.PHONY: $(BIN)
-        mkdir $(BIN)
+$(BIN)::
+        -mkdir $(BIN)
 
-$(BIN)/pack_f.$(SUFFIX): pack_f.for
+$(BIN)/pack_f.$(SUFFIX): pack_f.for $(BIN)
         $(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)
@@ -65 +65 @@
         $(DEL) pack_f.$(SUFFIX)
 
-$(BIN)/pypowder.$(SUFFIX): pypowder.for $(GSASlib)
+$(BIN)/pypowder.$(SUFFIX): pypowder.for $(GSASlib) $(BIN)
         $(F2PY) -c pypowder.for -m pypowder $(COMPILER) $(GSASlib)
         $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pypowder.$(SUFFIX)
@@ -74 +74 @@
         $(DEL) pypowder.$(SUFFIX)
 
-$(BIN)/pyspg.$(SUFFIX): pyspg.for $(SYMLIB)
+$(BIN)/pyspg.$(SUFFIX): pyspg.for $(SYMLIB) $(BIN)
         $(F2PY) -c pyspg.for $(SYMLIB) -m pyspg $(COMPILER)
         $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pyspg.$(SUFFIX)
@@ -83 +83 @@
         $(DEL) pyspg.$(SUFFIX)
 
-$(BIN)/polymask.$(SUFFIX): polymask.for $(SYMLIB)
+$(BIN)/polymask.$(SUFFIX): polymask.for $(SYMLIB) $(BIN)
         $(F2PY) -c polymask.for -m polymask $(COMPILER)
         $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib polymask.$(SUFFIX)
@@ -92 +92 @@
         $(DEL) polymask.$(SUFFIX)
 
-$(BIN)/histogram2d.$(SUFFIX): histogram2d.for $(SYMLIB)
+$(BIN)/histogram2d.$(SUFFIX): histogram2d.for $(SYMLIB) $(BIN)
         $(F2PY) -c histogram2d.for -m histogram2d $(COMPILER)
         $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib histogram2d.$(SUFFIX)
@@ -103 +103 @@
 
 # basic outline for build; change ????? and add any specific options to F2PY step
-# $(BIN)/?????.$(SUFFIX): ?????.for $(SYMLIB)
+# $(BIN)/?????.$(SUFFIX): ?????.for $(SYMLIB) $(BIN)
 #       $(F2PY) -c ?????.for -m ????? $(COMPILER)
 #       $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib ?????.$(SUFFIX)