<p><b>dwj07@fsu.edu</b> 2012-09-12 09:18:13 -0600 (Wed, 12 Sep 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Changing the order of includes for compilation of object files.<br>
This fixes an issue with the src/external ESMF version and the CESM ESMF version.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -226,4 +226,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(COREDEF) $(CPPINCLUDES) -DIWORDSIZE=4 -DRWORDSIZE=8 $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics_wrf -I./physics_eaung -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I./physics_wrf -I./physics_eaung -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -24,4 +24,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -46,7 +46,7 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
Modified: branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -34,4 +34,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../core_atmos_physics -I../core_atmos_physics/physics_wrf -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../core_atmos_physics -I../core_atmos_physics/physics_wrf -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -230,4 +230,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/core_sw/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_sw/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/core_sw/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -27,4 +27,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/driver/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/driver/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/driver/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -15,4 +15,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../core_$(CORE) -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../core_$(CORE) -I../external/esmf_time_f90 $(FCINCLUDES)
Modified: branches/ocean_projects/cesm_coupling/src/framework/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/framework/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -68,7 +68,7 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../external/esmf_time_f90
+ $(FC) $(FFLAGS) -c $*.f90 -I../external/esmf_time_f90 $(FCINCLUDES)
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
Modified: branches/ocean_projects/cesm_coupling/src/operators/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/operators/Makefile 2012-09-12 14:56:31 UTC (rev 2155)
+++ branches/ocean_projects/cesm_coupling/src/operators/Makefile 2012-09-12 15:18:13 UTC (rev 2156)
@@ -17,4 +17,4 @@
.F.o:
$(RM) $@ $*.mod
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
- $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework
+ $(FC) $(FFLAGS) -c $*.f90 -I../framework $(FCINCLUDES)
</font>
</pre>