--- trunk/GNUmakefile	2015/05/22 23:13:19	138
+++ trunk/GNUmakefile	2018/03/06 13:39:57	255
@@ -6,15 +6,18 @@
 
 makefile_dir = .
 
-VPATH := ${makefile_dir}/Sources $(addprefix ${makefile_dir}/Sources/, $(shell cat ${makefile_dir}/directories))
+VPATH := ${makefile_dir} $(addprefix ${makefile_dir}/, $(shell cat ${makefile_dir}/directories))
 
 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})
+sources := $(sort ${src_ce0l} ${src_gcm} ${src_test_ozonecm} ${src_test_inter_barxy} ${src_test_fxhyp} ${src_test_inifilr})
+
+lib_list = numer_rec_95 jumble nr_util netcdf95 netcdff
 
 # 2. Objects and executable files
 
@@ -23,13 +26,14 @@
 obj_test_ozonecm := $(src_test_ozonecm:.f=.o)
 obj_test_inter_barxy := $(src_test_inter_barxy:.f=.o)
 obj_test_fxhyp := $(src_test_fxhyp:.f=.o)
+obj_test_inifilr := $(src_test_inifilr:.f=.o)
 objects := $(sources:.f=.o)
-execut = ce0l gcm test_ozonecm test_inter_barxy test_fxhyp
+execut = ce0l gcm test_ozonecm test_inter_barxy test_fxhyp test_inifilr
 
 # 3. Compiler-dependent part
 
 mode = debug
-include Compiler_options/${FC}_${mode}.mk
+include ${general_compiler_options_dir}/${FC}_${mode}.mk
 
 # 4. Rules
 
@@ -43,6 +47,7 @@
 test_ozonecm: ${obj_test_ozonecm}
 test_inter_barxy: ${obj_test_inter_barxy}
 test_fxhyp: ${obj_test_fxhyp}
+test_inifilr: ${obj_test_inifilr}
 
 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