--- trunk/GNUmakefile	2018/04/19 17:54:55	266
+++ trunk/GNUmakefile	2018/07/25 14:15:44	291
@@ -17,7 +17,7 @@
 
 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
+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
@@ -33,24 +33,10 @@
 
 # 3. Compiler-dependent part
 
-mode = debug
-include ${general_compiler_options_dir}/${FC}_${mode}.mk
+include ${general_compiler_options_dir}/settings.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
 ce0l: ${obj_ce0l}
 gcm: ${obj_gcm}
@@ -62,20 +48,12 @@
 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 $^
-
 clean:
 	rm -f ${execut} ${objects} log
 
 clobber: clean
 	rm -f *.mod ${makefile_dir}/depend.mk TAGS
 
-log:
-	hostname >$@
-	${FC} ${version_flag} >>$@ 2>&1
-	@echo -e "\nFC = ${FC}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
-
 ifeq ($(findstring $(MAKECMDGOALS), clobber depend),)
 include ${makefile_dir}/depend.mk
 endif