Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/AGRIF/AA_make

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

File:

• branches/DEV_r1784_mid_year_merge_2010/AGRIF/AA_make (modified) (3 diffs)

branches/DEV_r1784_mid_year_merge_2010/AGRIF/AA_make

@@ -13 +13 @@
 #-Q- sxdkrz C_L   = $(FC_L) 
 #-Q- sxdkrz C_O   = $(FC_O) 
-#-Q- eshpux C_L   = $(FC_L) 
-#-Q- eshpux C_O   = $(FC_O) 
+#-Q- es2 C_L   = $(FC_L) 
+#-Q- es2 C_O   = $(FC_O) 
 #-Q- sx8mercure F_O +=  -Wf"-init heap=zero"
 #-Q- sx9mercure F_O +=  -Wf"-init heap=zero" 
 #-Q- sx8brodie F_O +=   -Wf"-init heap=zero" 
 #-Q- sxdkrz F_O +=  -Wf"-init heap=zero" 
-#-Q- eshpux F_O +=  -Wf"-init heap=zero" 
+#-Q- es2 F_O +=  -Wf"-init heap=zero" 
 #-Q- aix F_O = $(w_w) -I$(MODDIR) -qmoddir=$(MODDIR) -qextname
 #-Q- aix6 F_O = $(w_w) -I$(MODDIR) -qmoddir=$(MODDIR) -qextname
@@ -56 +56 @@
 $(SXMODEL_LIB) : $(OBJS)
 #-Q- sxdkrz     @$(A_X) $@ $(OBJS)
-#-Q- eshpux     @$(A_X) $@ $(OBJS)
+#-Q- es2     @$(A_X) $@ $(OBJS)
 
 $(AGRIFOBJS)/%.o : $(AGRIFFILES)/%.F KEY_CPP
@@ -70 +70 @@
 #-Q- sx8brodie mv *.mod $(MODDIR)
 #-Q- sxdkrz mv *.mod $(MODDIR)
-#-Q- eshpux mv *.mod $(MODDIR)
+#-Q- es2 mv *.mod $(MODDIR)
 #-Q- solaris   mv *.mod $(MODDIR)