--- trunk/GNUmakefile	2015/08/24 16:30:33	167
+++ trunk/GNUmakefile	2018/04/19 17:54:55	266
@@ -6,7 +6,7 @@
 
 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)
@@ -17,26 +17,38 @@
 
 sources := $(sort ${src_ce0l} ${src_gcm} ${src_test_ozonecm} ${src_test_inter_barxy} ${src_test_fxhyp} ${src_test_inifilr})
 
+cpp_macros = CPP_IIM=16,CPP_JJM=12,CPP_LLM=79
+lib_list = numer_rec_95 jumble nr_util netcdf95 netcdff
+
 # 2. Objects and executable files
 
-obj_ce0l := $(src_ce0l:.f=.o)
-obj_gcm := $(src_gcm:.f=.o)
-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)
+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
 
 # 3. Compiler-dependent part
 
 mode = debug
-include Compiler_options/${FC}_${mode}.mk
+include ${general_compiler_options_dir}/${FC}_${mode}.mk
 
 # 4. Rules
 
 SHELL = bash
 LINK.o = $(FC) $(LDFLAGS) $(TARGET_ARCH)
+
+%.o: %.f
+	@echo "Building $@..."
+	@$(COMPILE.f) $(OUTPUT_OPTION) $<
+
+%: %.o
+	@echo "Linking $@..."
+	@$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+
 .DELETE_ON_ERROR:
 .PHONY: all clean clobber depend
 all: ${execut} log
@@ -62,7 +74,7 @@
 log:
 	hostname >$@
 	${FC} ${version_flag} >>$@ 2>&1
-	echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
+	@echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
 
 ifeq ($(findstring $(MAKECMDGOALS), clobber depend),)
 include ${makefile_dir}/depend.mk