Ignore:
Timestamp:
Nov 29, 2013, 9:40:25 AM (11 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1860:1909 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/create_make_gcm

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory
    r1864 r1910  
    194194                  strlib=`echo $libstr | awk -F/ ' { print $1 } '`
    195195                  str2='$(LIBO)/lib'$strlib'.a('$strj'.o)'
     196               elif [ -f $dirinc/$stri.F90 ]  || [ -f $dirinc/$stri.F ]  ; then
     197                  strlib=`echo $libstr | awk -F/ ' { print $1 } '`
     198                  str2='$(LIBO)/lib'$strlib'.a('$stri'.o)'
    196199               fi
    197200            done
Note: See TracChangeset for help on using the changeset viewer.