Update Makefiles to use one-step preprocess/compile (#429)

* Update Makefiles to use one-step preprocess/compile

Updated the Makefiles and macros.* files to use single-step compilation
in which the compiler drives the preprocessor directly. This simplifies
the Makefiles (removing the need to clean up intermediate CPP files),
and has the added side effect of making the build system no longer case-
sensitive.

Author: rcabell

.gitignore

@@ -1,7 +1,4 @@
 *.o
-*.f
-*.f90
-*.F90
 *.mod
 *~
 Makefile.comm
@@ -23,3 +20,4 @@ README.md
 *pytest_cache*
 *.log
 compile_options.sh
+.DS_Store

trunk/NDHMS/CPL/CLM_cpl/Makefile

@@ -18,9 +18,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I ../../mod $(CLM_MOD) $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(MODFLAG) -I ../../mod $(CLM_MOD) $(*).F
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 
@@ -29,5 +27,5 @@ all:	$(OBJS)
 #
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~ 
 	cd ../..; make -f Makefile.comm clean

trunk/NDHMS/CPL/LIS_cpl/Makefile

@@ -18,9 +18,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I../../mod $(LIS_MOD) -I$(MOD_ESMF) $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(MODFLAG) -I../../mod $(LIS_MOD) -I$(MOD_ESMF) $(*).F
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 
@@ -29,4 +27,4 @@ all:	$(OBJS)
 #
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~ 

trunk/NDHMS/CPL/NoahMP_cpl/Makefile

@@ -16,10 +16,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-#	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) $(*).F
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 	cp *.mod ../../mod
@@ -33,4 +30,4 @@ hrldas_drv_HYDRO.o: module_hrldas_HYDRO.o ../../Data_Rec/module_namelist.o ../..
 
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f Noah_hrldas_beta
+	rm -f *.o *.mod *.stb *~ Noah_hrldas_beta

trunk/NDHMS/CPL/Noah_cpl/Makefile

@@ -16,10 +16,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-#	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(NETCDF_INC) $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(NETCDF_INC) $(*).F
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 
@@ -32,4 +29,4 @@ hrldas_drv_HYDRO.o: module_hrldas_HYDRO.o ../../Data_Rec/module_namelist.o ../..
 
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f Noah_hrldas_beta
+	rm -f *.o *.mod *.stb *~ Noah_hrldas_beta

trunk/NDHMS/CPL/WRF_cpl/Makefile

@@ -17,9 +17,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(WRF_ROOT)/frame -I$(WRF_ROOT)/main -I$(WRF_ROOT)/external/esmf_time_f90 $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(WRF_ROOT)/frame -I$(WRF_ROOT)/main -I$(WRF_ROOT)/external/esmf_time_f90 $(*).F
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 
@@ -31,4 +29,4 @@ module_wrf_HYDRO.o: ../../Data_Rec/module_RT_data.o ../../Data_Rec/module_nameli
 wrf_drv_HYDRO.o: module_wrf_HYDRO.o
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~

trunk/NDHMS/Data_Rec/Makefile

@@ -14,9 +14,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).f
-	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod
@@ -25,4 +23,4 @@ all:	$(OBJS)
 #
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~

trunk/NDHMS/Debug_Utilities/Makefile

@@ -12,9 +12,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).f
-	#$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod
@@ -23,4 +21,4 @@ all:	$(OBJS)
 #
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~

trunk/NDHMS/HYDRO_drv/Makefile

@@ -11,10 +11,7 @@ all:	$(OBJS)
 
 .F.o:
 	@echo ""
-	$(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
-#	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I../mod $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).f
-#	$(RMD) $(*).f
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).F
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod
@@ -26,4 +23,4 @@ module_HYDRO_drv.o: ../Data_Rec/module_namelist.o ../Data_Rec/module_RT_data.o .
         ../Routing/module_GW_baseflow.o ../Routing/module_HYDRO_utils.o ../Routing/module_HYDRO_io.o ../Routing/module_RT.o
 
 clean:
-	rm -f *.o *.mod *.stb *~ *.f
+	rm -f *.o *.mod *.stb *~

trunk/NDHMS/Land_models/Noah/GRAPHICS/HORIZ/Makefile

@@ -34,10 +34,7 @@ all:	$(CMD)
 
 .F.o:
 	@echo ""
-	$(RM) $(*).f
-	$(CPP) $(CPPFLAGS) $(*).F > $(*).f
-	$(F90) -c -I$(NETCDF)/include $(FFLAGS) $(MODDIR) $(*).f 
-	$(RM) $(*).f
+	$(F90) $(CPPINVOKE) $(CPPFLAGS) -c -I$(NETCDF)/include $(FFLAGS) $(MODDIR) $(*).F
 
 $(CMD):	$(OBJS)
 	$(F90) -o $(@) -I$(NETCDF)/include $(FFLAGS) $(OBJS) \