--- trunk/nag_rules.mk	2015/04/29 15:47:56	134
+++ trunk/nag_rules.mk	2017/04/20 14:44:47	221
@@ -3,25 +3,16 @@
 
 # Compiled modules created by NAG are needed.
 
-.PHONY: all_nag objects
-
-all_nag: objects CG_ce0l CG_gcm CR_ce0l CR_gcm
-objects: ${objects}
+.PHONY: all_nag
+all_nag: CG_ce0l CG_gcm
 
 # Call graphs:
-CG_ce0l: ${common_sources} ${src_ce0l_only}
-	nag_fcalls95 ${nag_fcalls_options} -listing $@ $^
-
-CG_gcm: ${common_sources} ${src_gcm_only}
-	nag_fcalls95 ${nag_fcalls_options} -listing $@ $^
-
-# Cross references:
-CR_ce0l: ${common_sources} ${src_ce0l_only}
-	nag_xref95 ${nag_cross_options} -listing $@ $^
+CG_ce0l: ${src_ce0l}
+	nagfor =callgraph ${nag_fcalls_options} -o $@ $^
 
-CR_gcm: ${common_sources} ${src_gcm_only}
-	nag_xref95 ${nag_cross_options} -listing $@ $^
+CG_gcm: ${src_gcm}
+	nagfor =callgraph ${nag_fcalls_options} -o $@ $^
 
 .PHONY: clean_nag
 clean_nag:
-	rm -f CG_ce0l CG_gcm CR_ce0l CR_gcm
+	rm -f CG_ce0l CG_gcm