Changeset 3356 for LMDZ6/branches/DYNAMICO-conv/create_make_gcm

Timestamp:

Jun 29, 2018, 12:31:11 PM (7 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• create_make_gcm (modified) (6 diffs)

LMDZ6/branches/DYNAMICO-conv/create_make_gcm

@@ -68 +68 @@
 echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
-echo 'L_COSP     = -lcosp'
 
 echo
@@ -78 +77 @@
    echo 'COMPILE90 = $(F90) $(OPTIM90) $(INCLUDE) -c'
    echo 'COMPTRU90 = $(F90) $(OPTIMTRU90) $(INCLUDE) -c'
-   echo "LINK    = $LINK"
-   echo "AR      = $AR"
+   echo 'LINK    = $(LINK)'
+   echo 'AR      = $(AR)'
+   echo 'ARFLAGS   = $(ARFLAGS)'
 echo
 echo
@@ -97 +97 @@
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_MISC) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_MISC) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'phys : $(LIBPHY)'
@@ -112 +112 @@
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
-echo
-echo 'cosp : $(LIBO)/libcosp.a'
 echo
 echo '$(FILTRE)3d : $(LIBO)/lib$(FILTRE).a'
@@ -229 +227 @@
          # object from library
          echo ' cd $(LIBO); \'
-         echo ' $(AR) d $(LIBO)/lib'$topdiri'.a '$fili'.o ; \'
+         echo ' $(AR) -d $(LIBO)/lib'$topdiri'.a '$fili'.o ; \'
          if [ "$F90" -eq '0' ] ; then
          ## Fixed Form Fortran 77
@@ -243 +241 @@
          fi
          # Put generated object in library
-         echo ' $(AR) r $(LIBO)/lib'$topdiri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
+         echo ' $(AR) $(ARFLAGS) $(LIBO)/lib'$topdiri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
          echo
       done