--- trunk/Compilation/GNUmakefile	2014/04/01 17:27:47	94
+++ trunk/Compilation/GNUmakefile	2014/04/25 14:58:31	97
@@ -4,13 +4,13 @@
 
 # 1. Source files
 
-compil_dir = .
+makefile_dir = .
 
-VPATH := ${compil_dir}/.. $(addprefix ${compil_dir}/../, $(shell cat ${compil_dir}/directories))
+VPATH := ${makefile_dir}/.. $(addprefix ${makefile_dir}/../, $(shell cat ${makefile_dir}/directories))
 
-common_sources := $(shell cat ${compil_dir}/common_sources)
-src_ce0l_only := $(shell cat ${compil_dir}/src_ce0l_only)
-src_gcm_only := $(shell cat ${compil_dir}/src_gcm_only)
+common_sources := $(shell cat ${makefile_dir}/common_sources)
+src_ce0l_only := $(shell cat ${makefile_dir}/src_ce0l_only)
+src_gcm_only := $(shell cat ${makefile_dir}/src_gcm_only)
 sources = ${src_ce0l_only} ${src_gcm_only} ${common_sources}
 
 # 2. Objects and executable files
@@ -38,8 +38,8 @@
 ce0l: ${obj_ce0l}
 gcm: ${obj_gcm}
 
-depend ${compil_dir}/depend.mk:
-	makedepf90 -free -Wmissing -Wconfused $(addprefix -I, ${VPATH}) -nosrc $(addprefix -u , netcdf numer_rec_95 netcdf95 nr_util jumble) ${sources} >${compil_dir}/depend.mk
+depend ${makefile_dir}/depend.mk:
+	makedepf90 -free -Wmissing -Wconfused $(addprefix -I, ${VPATH}) -nosrc $(addprefix -u , netcdf numer_rec_95 netcdf95 nr_util jumble) ${sources} >${makefile_dir}/depend.mk
 
 TAGS: ${sources}
 	ctags -e --language-force=fortran $^
@@ -48,7 +48,7 @@
 	rm -f ${execut} ${objects} log
 
 clobber: clean
-	rm -f *.mod ${compil_dir}/depend.mk TAGS ${compil_dir}/TAGS
+	rm -f *.mod ${makefile_dir}/depend.mk TAGS
 
 log:
 	hostname >$@
@@ -56,7 +56,7 @@
 	echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
 
 ifeq ($(findstring $(MAKECMDGOALS), clobber depend),)
-include ${compil_dir}/depend.mk
+include ${makefile_dir}/depend.mk
 endif
 
 -include grep.mk