--- trunk/GNUmakefile	2014/02/28 17:52:47	79
+++ trunk/Compilation/GNUmakefile	2014/04/01 17:27:47	94
@@ -2,43 +2,32 @@
 
 # This makefile builds LMDZE.
 
-# Suffixes are:
-# "f90" for free format, no preprocessing
-# "f" for fixed format, no preprocessing
-
 # 1. Source files
 
-src_root = .
+compil_dir = .
 
-VPATH := ${src_root} $(addprefix ${src_root}/, $(shell cat ${src_root}/directories))
+VPATH := ${compil_dir}/.. $(addprefix ${compil_dir}/../, $(shell cat ${compil_dir}/directories))
 
-common_sources := $(shell cat ${src_root}/common_sources)
-src_ce0l_only := $(shell cat ${src_root}/src_ce0l_only)
-src_gcm_only := $(shell cat ${src_root}/src_gcm_only)
+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)
 sources = ${src_ce0l_only} ${src_gcm_only} ${common_sources}
 
 # 2. Objects and executable files
 
-obj_ce0l := $(addsuffix .o, $(sort $(basename ${common_sources} ${src_ce0l_only})))
-
-obj_gcm := $(addsuffix .o, $(sort $(basename ${common_sources} ${src_gcm_only})))
-
-objects := $(addsuffix .o, $(basename ${sources}))
+obj_ce0l := $(sort ${common_sources:.f=.o} ${src_ce0l_only:.f=.o})
+obj_gcm := $(sort ${common_sources:.f=.o} ${src_gcm_only:.f=.o})
+objects := $(sources:.f=.o)
 execut = ce0l gcm
 
 # 3. Compiler-dependent part
 
 mode = debug
-include Compilers/${FC}_${mode}.mk
+include Compiler_options/${FC}_${mode}.mk
 
 # 4. Rules
 
 SHELL = bash
-COMPILE.f90 = $(FC) $(F90FLAGS) $(TARGET_ARCH) -c
-
-%.o: %.f90
-	$(COMPILE.f90) $(OUTPUT_OPTION) $<
-
 .DELETE_ON_ERROR:
 .PHONY: all clean clobber depend
 all: ${execut} log
@@ -49,25 +38,25 @@
 ce0l: ${obj_ce0l}
 gcm: ${obj_gcm}
 
-depend ${src_root}/depend.mk:
-	makedepf90 -Wmissing -Wconfused $(addprefix -I, ${VPATH}) -nosrc $(addprefix -u , netcdf numer_rec_95 netcdf95 nr_util jumble) ${sources} >${src_root}/depend.mk
+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
 
-${src_root}/TAGS: ${sources}
-	ctags -e --language-force=fortran -f $@ $^
+TAGS: ${sources}
+	ctags -e --language-force=fortran $^
 
 clean:
 	rm -f ${execut} ${objects} log
 
 clobber: clean
-	rm -f *.mod ${src_root}/depend.mk ${src_root}/TAGS
+	rm -f *.mod ${compil_dir}/depend.mk TAGS ${compil_dir}/TAGS
 
 log:
 	hostname >$@
 	${FC} ${version_flag} >>$@ 2>&1
 	echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
 
-ifneq ($(MAKECMDGOALS), clobber)
-include ${src_root}/depend.mk
+ifeq ($(findstring $(MAKECMDGOALS), clobber depend),)
+include ${compil_dir}/depend.mk
 endif
 
 -include grep.mk