Changeset 128


Ignore:
Timestamp:
Jul 22, 2010 6:01:22 PM (11 years ago)
Author:
toby
Message:

Linux build opts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/fsource/Makefile

    r127 r128  
    99#----------------------------------------------------------------------
    1010# linux (gfortran)
    11 #GSASlib = ./libgsas.a
    12 #COMPILER=--fcompiler=gnu95
     11GSASlib = ./libgsas.a
     12COMPILER=--fcompiler=gnu95
     13PACKCOPTS=--f77flags="-fno-range-check"
     14SUFFIX=so
     15F2PY=f2py
     16MOVE=mv
     17DEL= \#
     18#----------------------------------------------------------------------
     19# mac (gfortran)
     20#GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
     21#COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
    1322#PACKCOPTS=--f77flags="-fno-range-check"
    1423#SUFFIX=so
    1524#F2PY=f2py
    1625#MOVE=mv
    17 #DEL=echo
    18 #----------------------------------------------------------------------
    19 # mac (gfortran)
    20 GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
    21 COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
    22 PACKCOPTS=--f77flags="-fno-range-check"
    23 SUFFIX=so
    24 F2PY=f2py
    25 MOVE=mv
    26 DEL=\#
    27 MACFIX = install_name_tool -change
    28 MACCOPY = cp
     26#DEL=\#
     27#MACFIX = install_name_tool -change
     28#MACCOPY = cp
    2929#----------------------------------------------------------------------
    3030# windows g77
     
    5353# Use otool -L <file.so> to see what is required
    5454#
    55 .PHONY: $(BIN)
    56         mkdir $(BIN)
     55$(BIN)::
     56        -mkdir $(BIN)
    5757
    58 $(BIN)/pack_f.$(SUFFIX): pack_f.for
     58$(BIN)/pack_f.$(SUFFIX): pack_f.for $(BIN)
    5959        $(F2PY) -c pack_f.for -m pack_f $(COMPILER) $(PACKCOPTS)
    6060        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pack_f.$(SUFFIX)
     
    6565        $(DEL) pack_f.$(SUFFIX)
    6666
    67 $(BIN)/pypowder.$(SUFFIX): pypowder.for $(GSASlib)
     67$(BIN)/pypowder.$(SUFFIX): pypowder.for $(GSASlib) $(BIN)
    6868        $(F2PY) -c pypowder.for -m pypowder $(COMPILER) $(GSASlib)
    6969        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pypowder.$(SUFFIX)
     
    7474        $(DEL) pypowder.$(SUFFIX)
    7575
    76 $(BIN)/pyspg.$(SUFFIX): pyspg.for $(SYMLIB)
     76$(BIN)/pyspg.$(SUFFIX): pyspg.for $(SYMLIB) $(BIN)
    7777        $(F2PY) -c pyspg.for $(SYMLIB) -m pyspg $(COMPILER)
    7878        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib pyspg.$(SUFFIX)
     
    8383        $(DEL) pyspg.$(SUFFIX)
    8484
    85 $(BIN)/polymask.$(SUFFIX): polymask.for $(SYMLIB)
     85$(BIN)/polymask.$(SUFFIX): polymask.for $(SYMLIB) $(BIN)
    8686        $(F2PY) -c polymask.for -m polymask $(COMPILER)
    8787        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib polymask.$(SUFFIX)
     
    9292        $(DEL) polymask.$(SUFFIX)
    9393
    94 $(BIN)/histogram2d.$(SUFFIX): histogram2d.for $(SYMLIB)
     94$(BIN)/histogram2d.$(SUFFIX): histogram2d.for $(SYMLIB) $(BIN)
    9595        $(F2PY) -c histogram2d.for -m histogram2d $(COMPILER)
    9696        $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib histogram2d.$(SUFFIX)
     
    103103
    104104# basic outline for build; change ????? and add any specific options to F2PY step
    105 # $(BIN)/?????.$(SUFFIX): ?????.for $(SYMLIB)
     105# $(BIN)/?????.$(SUFFIX): ?????.for $(SYMLIB) $(BIN)
    106106#       $(F2PY) -c ?????.for -m ????? $(COMPILER)
    107107#       $(MACFIX) /usr/local/lib/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib ?????.$(SUFFIX)
Note: See TracChangeset for help on using the changeset viewer.