* Makefile: default build is no longer the multi profile build. Do

	build both 1.1 and 2.0 profiles use the all-profiles target.

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

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index 51b513e962ee0014acb20b241b9895fb3f9fa189..be27c3aa915d4a4a98f851e024879bbbc6aa53cb 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Jackson Harper  <jackson@ximian.com>
+
+       * Makefile: default build is no longer the multi profile build. Do
+       build both 1.1 and 2.0 profiles use the all-profiles target.
+       
 2004-05-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Makefile: disable net_2_0 on windows. It doesn't build. Don't

diff --git a/mcs/Makefile b/mcs/Makefile
index cb1b63c603b4e86478ea035d001b91d9ebd5223b..fce348c729636bddb8c1e99629c6cbb5628ace4f 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -9,14 +9,7 @@ include build/rules.make
 
 .PHONY: all clean all-profile clean-profile install uninstall test run-test testcorlib
 all clean:
-ifeq ($(PROFILE),)
-       $(MAKE) PROFILE=default $@-profile
-ifneq ($(PLATFORM),win32)
-       $(MAKE) PROFILE=net_2_0 $@-profile
-endif
-else
-       $(MAKE) PROFILE=$(PROFILE) $@-profile
-endif
+       $(MAKE) $@-profile
 
 all-profile: platform-check profile-check all-recursive
 
@@ -32,6 +25,10 @@ clean-profile: clean-recursive #clean-local
 
 # fun specialty targets
 
+all-profiles:
+       $(MAKE) PROFILE=default all || exit 1 ; \
+       $(MAKE) PROFILE=net_2_0 all || exit 1 ;
+
 testcorlib:
        @cd class/corlib && $(MAKE) test run-test