--- trunk/GNUmakefile	2013/11/15 18:45:49	76
+++ trunk/GNUmakefile	2018/12/10 15:54:30	313
@@ -2,80 +2,55 @@
 
 # This makefile builds LMDZE.
 
-# Suffixes are:
-# "f90" for free format, no preprocessing
-# "f" for fixed format, no preprocessing
-
 # 1. Source files
 
-src_root = .
-
-VPATH = ${src_root}:${src_root}/dyn3d:${src_root}/dyn3d/Vlsplt:${src_root}/filtrez:${src_root}/phylmd:${src_root}/bibio:${src_root}/phylmd/Mobidic:${src_root}/phylmd/Orography:${src_root}/phylmd/Radlwsw:${src_root}/IOIPSL:${src_root}/IOIPSL/Stringop:${src_root}/dyn3d/Read_reanalyse:${src_root}/phylmd/Thermcell:${src_root}/phylmd/CV3_routines:${src_root}/phylmd/Conflx:${src_root}/phylmd/CV_routines:${src_root}/phylmd/Interface_surf:${src_root}/dyn3d/Dissipation:${src_root}/IOIPSL/Histcom
-
-common_sources := $(shell cat ${src_root}/common_sources)
-
-sources_ce0l := $(sort ${common_sources} $(shell cat ${src_root}/sources_ce0l_only))
-
-sources_gcm := $(sort ${common_sources} $(shell cat ${src_root}/sources_gcm_only))
+makefile_dir = .
 
-sources := $(sort ${sources_ce0l} ${sources_gcm})
+src_ce0l := $(shell cat ${makefile_dir}/src_ce0l)
+src_gcm := $(shell cat ${makefile_dir}/src_gcm)
+src_test_ozonecm := $(shell cat ${makefile_dir}/src_test_ozonecm)
+src_test_inter_barxy := $(shell cat ${makefile_dir}/src_test_inter_barxy)
+src_test_fxhyp := $(shell cat ${makefile_dir}/src_test_fxhyp)
+src_test_inifilr := $(shell cat ${makefile_dir}/src_test_inifilr)
+
+sources := $(sort ${src_ce0l} ${src_gcm} ${src_test_ozonecm} ${src_test_inter_barxy} ${src_test_fxhyp} ${src_test_inifilr})
+
+include ${general_compiler_options_dir}/settings.mk
+
+VPATH += $(addprefix ${makefile_dir}/, $(shell cat ${makefile_dir}/directories))
+cpp_macros = CPP_IIM=16,CPP_JJM=12,CPP_LLM=11
+lib_list = numer_rec_95 jumble nr_util netcdf95 netcdff
 
 # 2. Objects and executable files
 
-# Object files:
-obj_ce0l := $(addsuffix .o, $(basename ${sources_ce0l}))
-obj_gcm := $(addsuffix .o, $(basename ${sources_gcm}))
+obj_ce0l := $(addsuffix .o, $(basename ${src_ce0l}))
+obj_gcm := $(addsuffix .o, $(basename ${src_gcm}))
+obj_test_ozonecm := $(addsuffix .o, $(basename ${src_test_ozonecm}))
+obj_test_inter_barxy := $(addsuffix .o, $(basename ${src_test_inter_barxy}))
+obj_test_fxhyp := $(addsuffix .o, $(basename ${src_test_fxhyp}))
+obj_test_inifilr := $(addsuffix .o, $(basename ${src_test_inifilr}))
 objects := $(addsuffix .o, $(basename ${sources}))
+execut = ce0l gcm test_ozonecm test_inter_barxy test_fxhyp test_inifilr
 
-# Executable files:
-execut = ce0l gcm
-
-# 3. Compiler-dependent part
-
-mode = debug
-include ../Compilers/${FC}_${mode}.mk
-
-# 4. Rules
-
-SHELL = bash
-
-# Extend known suffixes:
-
-COMPILE.f90 = $(FC) $(F90FLAGS) $(TARGET_ARCH) -c
-
-%.o: %.f90
-	$(COMPILE.f90) $(OUTPUT_OPTION) $<
-
-.PHONY: all clean clobber depend
-
-all: ${execut} trace
-
-${execut}:
-	$(FC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+# 3. Rules
 
+all: ${execut} log
 ce0l: ${obj_ce0l}
 gcm: ${obj_gcm}
+test_ozonecm: ${obj_test_ozonecm}
+test_inter_barxy: ${obj_test_inter_barxy}
+test_fxhyp: ${obj_test_fxhyp}
+test_inifilr: ${obj_test_inifilr}
 
-depend ${src_root}/depend.mk:
-	makedepf90 -Wmissing -Wconfused -I${VPATH} -nosrc $(addprefix -u, netcdf numer_rec_95 netcdf95 nr_util jumble) ${sources} >${src_root}/depend.mk
-
-TAGS: ${sources}
-	ctags -e --language-force=fortran $^
+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
 
 clean:
-	rm -f ${objects}
-	rm -f ${execut} trace
-
-clobber: clean
-	rm -f *.mod ${src_root}/depend.mk ${src_root}/TAGS
-
-trace:
-	${FC} ${version_flag} >$@ 2>&1
-	echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
+	rm -f ${execut} ${objects} log
 
-# Dependencies among object files:
-include ${src_root}/depend.mk
+ifeq ($(findstring $(MAKECMDGOALS), clobber depend),)
+include ${makefile_dir}/depend.mk
+endif
 
-# Other rules, optionally:
 -include grep.mk
 -include nag_rules.mk