--- trunk/libf/call_graph.mk	2008/03/04 14:00:42	6
+++ trunk/libf/nag_tools.mk	2008/03/31 12:24:17	7
@@ -1,24 +1,23 @@
-# Needs compiled modules created by NAG.
+# This is an extension to the LMDZE makefile, useful for NAG Fortran
+# tools. It should be included in the LMDZE makefile.
+
+# Compiled modules created by NAG are needed.
 
 .PHONY: objects
 objects: ${objects}
 # (useful for NAG module builder)
 
-nag_fcalls_options = -calledby -locate -class
-nag_cross_options = -key
-
-# NAG general options:
-nag_options = -dusty ${inc_flags}
-
-call_graph_etat0_lim: $(filter-out netcdf95.f90, ${sources_etat0_lim})
-	@nag_fcalls95 ${nag_options} ${nag_fcalls_options} -listing $@ $^
-
-call_graph_gcm: $(filter-out netcdf95.f90, ${sources_gcm})
-	@nag_fcalls95 ${nag_options} ${nag_fcalls_options} -listing $@ $^
-
-cross_ref_etat0_lim: ${sources_etat0_lim}
-	@nag_xref95 ${nag_options} ${nag_cross_options} -listing $@ $^
-
-.PHONY: clean_call_graph
-clean_call_graph:
-	rm -f call_graph_etat0_lim call_graph_gcm
+# Call graph:
+CG_etat0_lim: ${sources_etat0_lim}
+	@nag_fcalls95 ${nag_fcalls_options} -listing $@ $^
+
+CG_gcm: ${sources_gcm}
+	@nag_fcalls95 ${nag_fcalls_options} -listing $@ $^
+
+# Cross references:
+CR_etat0_lim: ${sources_etat0_lim}
+	@nag_xref95 ${nag_cross_options} -listing $@ $^
+
+.PHONY: clean_nag
+clean_nag:
+	rm -f CG_etat0_lim CG_gcm CR_etat0_lim