2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index 2df7ab91667e99fa35b425957104f917a90c97e6..cedf9c3518cac861df38c47f6744d7aa0e180864 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,30 +1,21 @@
 thisdir := .
 
-SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs tools/resgen class mbas nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
 basic_SUBDIRS := jay mcs class
-net_1_1_bootstrap_SUBDIRS := jay mcs class
+net_1_1_bootstrap_SUBDIRS := jay mcs class tools
 net_2_0_bootstrap_SUBDIRS := class
-net_2_0_SUBDIRS := jay gmcs class tests errors tools
+net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
 
 ifdef TEST_SUBDIRS
 $(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
 endif
 
-OVERRIDE_TARGET_ALL = yes
-
 include build/rules.make
 
 all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
 
-# Used when OVERRIDE_TARGET_ALL is defined
-all.override:
-ifndef NO_SIGN_ASSEMBLY
-       $(MAKE) NO_SIGN_ASSEMBLY=yes all.real
-endif
-       $(MAKE) all.real
-
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
        @:
@@ -44,19 +35,15 @@ profiles-do--%:
 profile-do--%:
        $(MAKE) PROFILE=$(subst --, ,$*)
 
+# We don't want to run the tests in parallel.  We want behaviour like -k.
 profiles-do--run-test:
-       ret=:; \
-       $(MAKE) PROFILE=default run-test || ret=false; \
-       $(MAKE) PROFILE=net_2_0 run-test && $$ret
+       ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret
 
 # Orchestrate the bootstrap here.
-profiles-do--all: profile-do--net_2_0--all
-
 profile-do--net_2_0--all: profile-do--net_2_0_bootstrap--all
 profile-do--net_2_0_bootstrap--all: profile-do--default--all
-
-ifeq (linux, $(PLATFORM))
 profile-do--default--all: profile-do--net_1_1_bootstrap--all
+ifeq (linux, $(PLATFORM))
 profile-do--net_1_1_bootstrap--all: profile-do--basic--all
 endif
 
@@ -87,7 +74,8 @@ DISTFILES = \
        MonoIcon.png            \
        README                  \
        ScalableMonoIcon.svg    \
-       winexe.in
+       winexe.in               \
+       nunit.key
 
 dist-local: dist-default