X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=938ac2279f89710c698e1f3a99ce3e6e56509b3e;hb=90542ec8a627b700207ac0cbd097b83a66ad23f2;hp=146edba8950c4b439f2d89e7fcf31a67439f114a;hpb=b01f31990caa0ed89c60d2b8182af5d26d3bff20;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 146edba8950..938ac2279f8 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,12 +1,13 @@
 thisdir := .
 
-SUBDIRS := build jay mcs tools/resgen class mbas nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
-basic_SUBDIRS := jay mcs class
-net_1_1_bootstrap_SUBDIRS := jay mcs class ilasm tools
-net_2_0_bootstrap_SUBDIRS := class
-net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
+basic_SUBDIRS := build jay mcs class
+net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
+net_2_0_bootstrap_SUBDIRS := build jay mcs class ilasm tools
+net_2_0_SUBDIRS := build jay gmcs class nunit20 ilasm tools tests errors
+net_2_1_SUBDIRS := build smcs class tools
 
 # List of test subdirs that should pass 100%
 centum_tests := \
@@ -22,7 +23,6 @@ centum_tests := \
 	class/System.Runtime.Serialization.Formatters.Soap \
 	class/System.Security \
 	class/System.ServiceProcess \
-	class/System.Web \
 	class/System.Web.Services \
 	tests \
 	errors
@@ -32,7 +32,7 @@ default_centum_tests :=		\
 	class/System.XML	\
 	class/System.Data
 
-net_2_0_centum_tests := $(centum_tests) # class/Mono.C5
+net_2_0_centum_tests := $(centum_tests) #class/Mono.C5
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -74,9 +74,7 @@ _boot_ = all clean install
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
 $(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--default--%
 $(_boot_:%=profile-do--default--%):           profile-do--default--%:           profile-do--net_1_1_bootstrap--%
-ifeq (linux, $(PLATFORM))
 $(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
-endif
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -99,6 +97,7 @@ DISTFILES = \
 	LICENSE			\
 	LICENSE.GPL		\
 	LICENSE.LGPL		\
+	LICENSE.MPL		\
 	Makefile		\
 	mkinstalldirs		\
 	MIT.X11			\
@@ -116,7 +115,7 @@ dist-pre:
 
 dist-tarball: dist-pre
 	$(MAKE) distdir='$(package)' dist-recursive
-	tar cvzf $(package).tar.gz $(package)
+	tar cvjf $(package).tar.bz2 $(package)
 
 dist: dist-tarball
 	rm -rf $(package)
@@ -137,9 +136,9 @@ distcheck: dist-tarball
 	    $(MAKE) prefix=$(prefix) && $(MAKE) test && $(MAKE) install DESTDIR="$$destdir" && \
 	    $(MAKE) clean && $(MAKE) dist || exit 1) || exit 1 ; \
 	mv Distcheck-MCS $(package) ; \
-	tar tzf $(package)/$(package).tar.gz |sed -e 's,/$$,,' |sort >distdist.list ; \
-	rm $(package)/$(package).tar.gz ; \
-	tar tzf $(package).tar.gz |sed -e 's,/$$,,' |sort >before.list ; \
+	tar tjf $(package)/$(package).tar.bz2 |sed -e 's,/$$,,' |sort >distdist.list ; \
+	rm $(package)/$(package).tar.bz2 ; \
+	tar tjf $(package).tar.bz2 |sed -e 's,/$$,,' |sort >before.list ; \
 	find $(package) |egrep -v '(makefrag|response)' |sed -e 's,/$$,,' |sort >after.list ; \
 	cmp before.list after.list || exit 1 ; \
 	cmp before.list distdist.list || exit 1 ; \
@@ -151,7 +150,7 @@ monocharge:
 	mkdir "$$chargedir" ; \
 	DESTDIR=`cd "$$chargedir" && pwd` ; \
 	$(MAKE) install DESTDIR="$$DESTDIR" || exit 1 ; \
-	tar cvzf "$$chargedir".tgz "$$chargedir" ; \
+	tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
 	rm -rf "$$chargedir"
 
 # A bare-bones monocharge.
@@ -165,5 +164,5 @@ monocharge-lite:
 	$(MAKE) -C class/System install DESTDIR="$$DESTDIR" || exit 1; \
 	$(MAKE) -C class/System.XML install DESTDIR="$$DESTDIR" || exit 1; \
 	$(MAKE) -C class/Mono.CSharp.Debugger install DESTDIR="$$DESTDIR" || exit 1; \
-	tar cvzf "$$chargedir".tgz "$$chargedir" ; \
+	tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
 	rm -rf "$$chargedir"