--- trunk/libf/GNUmakefile	2013/06/24 15:39:52	70
+++ trunk/libf/GNUmakefile	2013/11/15 18:02:57	74
@@ -10,20 +10,21 @@
 
 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:${src_root}/IOIPSL/Flincom
+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 := ${common_sources} $(shell cat ${src_root}/sources_ce0l_only)
-sources_gcm := ${common_sources} $(shell cat ${src_root}/sources_gcm_only)
+
+sources_ce0l := $(sort ${common_sources} $(shell cat ${src_root}/sources_ce0l_only))
+
+sources_gcm := $(sort ${common_sources} $(shell cat ${src_root}/sources_gcm_only))
 
 sources := $(sort ${sources_ce0l} ${sources_gcm})
-# (sort so that each filename appears only once)
 
 # 2. Objects and executable files
 
 # Object files:
-obj_ce0l := $(addsuffix .o, $(sort $(basename ${sources_ce0l})))
-obj_gcm := $(addsuffix .o, $(sort $(basename ${sources_gcm})))
+obj_ce0l := $(addsuffix .o, $(basename ${sources_ce0l}))
+obj_gcm := $(addsuffix .o, $(basename ${sources_gcm}))
 objects := $(addsuffix .o, $(basename ${sources}))
 
 # Executable files:
@@ -39,7 +40,9 @@
 SHELL = bash
 
 # Extend known suffixes:
+
 COMPILE.f90 = $(FC) $(F90FLAGS) $(TARGET_ARCH) -c
+
 %.o: %.f90
 	$(COMPILE.f90) $(OUTPUT_OPTION) $<
 
@@ -56,8 +59,8 @@
 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
 
-${src_root}/TAGS: ${sources}
-	ctags -e --language-force=fortran -f $@ $^
+TAGS: ${sources}
+	ctags -e --language-force=fortran $^
 
 clean:
 	rm -f ${objects}
@@ -73,6 +76,6 @@
 # Dependencies among object files:
 include ${src_root}/depend.mk
 
-# Other rules, optionnally:
+# Other rules, optionally:
 -include grep.mk
 -include nag_rules.mk