--- trunk/libf/call_graph.mk	2008/02/27 13:16:39	3
+++ trunk/libf/nag_rules.mk	2008/07/28 14:48:09	14
@@ -1,15 +1,29 @@
-# 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.
 
-.PHONY: objects
+# Compiled modules created by NAG are needed.
+
+.PHONY: all_nag objects
+
+all_nag: objects CG_etat0_lim CG_gcm CR_etat0_lim CR_gcm
 objects: ${objects}
-# (useful for NAG module builder)
 
-call_graph_etat0_lim: ${sources_etat0_lim}
-	@nag_fcalls95 -calledby -dusty -locate ${inc_flags} -listing $@ $^
+# Call graphs:
+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 $@ $^
+
+CR_gcm: ${sources_gcm}
+	nag_xref95 ${nag_cross_options} -listing $@ $^
 
-call_graph_gcm: $(filter-out netcdf95.f90, ${sources_gcm})
-	@nag_fcalls95 -calledby -dusty -locate -class ${inc_flags} -listing $@ $^
+CG_etat0_lim CG_gcm CR_etat0_lim CR_gcm: objects
 
-.PHONY: clean_call_graph
-clean_call_graph:
-	rm -f call_graph_etat0_lim call_graph_gcm
+.PHONY: clean_nag
+clean_nag:
+	rm -f CG_etat0_lim CG_gcm CR_etat0_lim CR_gcm