2004-05-12 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* Makefile: disable net_2_0 on windows. It doesn't build. Don't
	try to build net_1_0 and net_2_0 if we provide a PROFILE=xxx in the
	command line.

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

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index c5fdf0f2b07f0fe6ae62bb7cd204796c6edccb4e..51b513e962ee0014acb20b241b9895fb3f9fa189 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Makefile: disable net_2_0 on windows. It doesn't build. Don't
+       try to build net_1_0 and net_2_0 if we provide a PROFILE=xxx in the
+       command line.
+
 2004-05-10  Raja R Harinath  <rharinath@novell.com>
 
        * INSTALL.txt: Don't mention 'fullbuild'.  Mention 'bootstrap'

diff --git a/mcs/Makefile b/mcs/Makefile
index c8d88a8d5512549fa1a3c75387712e08528ca026..cb1b63c603b4e86478ea035d001b91d9ebd5223b 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -9,8 +9,14 @@ 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
 
 all-profile: platform-check profile-check all-recursive