X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=7325bf422064e2d24817ce88ce85ab4a4d21d533;hb=feca28835d4e3cb2be67bdcbd4f54fee62c3797a;hp=732936c04b9537e13055282bfcab4cdaa502d90a;hpb=6cfd2055426c190ca2f6a9f8ca3af2da6f6a79d0;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 732936c04b9..7325bf42206 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 := build jay mcs class
 net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
-net_2_0_bootstrap_SUBDIRS := build class ilasm
-net_2_0_SUBDIRS := build jay gmcs class nunit20 ilasm tests errors 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 jay gmcs class
 
 # List of test subdirs that should pass 100%
 centum_tests := \
@@ -31,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)
@@ -96,6 +97,7 @@ DISTFILES = \
 	LICENSE			\
 	LICENSE.GPL		\
 	LICENSE.LGPL		\
+	LICENSE.MPL		\
 	Makefile		\
 	mkinstalldirs		\
 	MIT.X11			\
@@ -113,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)
@@ -134,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 ; \
@@ -148,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.
@@ -162,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"