Changeset 2408 for LMDZ5/branches/testing/create_make_gcm

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/create_make_gcm

@@ -54 +54 @@
 echo "PHYS  = "
 echo 'LIBPHY = $(LIBO)/libphy$(PHYS).a'
+echo 'LIBPHY_COMMON= $(LIBO)/libphy_common.a'
 echo 'LIBDYN_PHY = $(LIBO)/libdynlmdz_phy$(PHYS).a'
 echo 'DIRMAIN=dyn$(DIM)d$(FLAG_PARA)'
@@ -64 +65 @@
 echo 'L_FILTRE   = -l$(FILTRE)'
 echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
-echo 'L_PHY = -lphy$(PHYS) '
+echo 'L_PHY = -lphy$(PHYS) -lphy_common'
 echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
@@ -92 +93 @@
 echo
 #echo 'main : chimie $(DYN) misc phys $(OPTION_DEP) '
-echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys phy_common dyn_phy $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
@@ -99 +100 @@
 echo
 echo 'phys : $(LIBPHY)'
+echo 'phy_common : $(LIBPHY_COMMON)'
 echo 'dyn3d : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(LIBO)/lib$(FILTRE).a $(LIBO)/libdyn3d_common.a'
 echo 'dyn2d : $(LIBO)/libdyn2d.a'