* rules.make (STD_TARGETS): Make them all go through an indirection.

(all): Indirect through do-all.
(all.real): Remove.
(do-%): New pattern fallback.  Performs the standard behaviour:
%-recursive, and then %-local.
(do-run-test): New.  Make '-k' more useful.
Reported by Ritvik Mayank.

svn path=/trunk/mcs/; revision=44907

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 23e98db498d1bb27492da370b02e2269f7b5915f..1c5d6c8d80f9eb0bb6c737c780daa5ec5692e47d 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-23  Raja R Harinath  <rharinath@novell.com>
+
+       * rules.make (STD_TARGETS): Make them all go through an
+       indirection.
+       (all): Indirect through do-all.
+       (all.real): Remove.
+       (do-%): New pattern fallback.  Performs the standard behaviour:
+       %-recursive, and then %-local.
+       (do-run-test): New.  Make '-k' more useful.
+       Reported by Ritvik Mayank.
+
 2005-05-10  Raja R Harinath  <rharinath@novell.com>
 
        * library.make (dist-fixup): Fix typo.

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 0000c471dcb46534145809f735a6eb4d3f52948b..e2332d34029d1e1a823535437d9c468264186217 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -98,16 +98,18 @@ include $(topdir)/build/profiles/$(PROFILE).make
 ifdef OVERRIDE_TARGET_ALL
 all: all.override
 else
-all: all.real
+all: do-all
 endif
 
-all.real: all-recursive
-       $(MAKE) all-local
-
 STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
 
-$(STD_TARGETS): %: %-recursive
-       $(MAKE) $@-local
+$(STD_TARGETS): %: do-%
+
+do-run-test:
+       ok=:; $(MAKE) run-test-recursive || ok=false; $(MAKE) run-test-local || ok=false; $$ok
+
+do-%: %-recursive
+       $(MAKE) $*-local
 
 # The way this is set up, any profile-specific subdirs list should
 # be listed _before_ including rules.make.  However, the default