X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=c2591932058831b9f9566af31aed488cf6f1ee83;hb=cf42d05cbddbae6b48f332b423710a34556ee242;hp=fe4c5f7ceab2457918f23a072aa1b529e8ab3ac7;hpb=3f761fefe47213af1301315e2aca06a792d706cc;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index fe4c5f7ceab..c2591932058 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,28 +1,30 @@
 thisdir := .
-SUBDIRS := build jay mcs class mbas nunit20 monoresgen ilasm tools tests errors docs
+SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
+OVERRIDE_TARGET_ALL = yes
 include build/rules.make
 
-all-local: platform-check
+all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
 
-install-local: platform-check
+all.override:
+	$(MAKE) NO_SIGN_ASSEMBLY=yes all.real
+	$(MAKE) all.real
 
-test-local: platform-check
+all-local $(STD_TARGETS:=-local):
+	@:
 
-clean-local:
+# fun specialty targets
 
-dist-local:
+all-profiles:
+	$(MAKE) PROFILE=default all
+	$(MAKE) PROFILE=net_2_0 all
 
-# fun specialty targets
+clean-profiles:
+	$(MAKE) PROFILE=default clean
+	$(MAKE) PROFILE=net_2_0 clean
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
 
-bootstrap:
-	$(MAKE) all MCS='$$(INTERNAL_MCS)'
-
-unbootstrap:
-	$(MAKE) all MCS='$$(BOOTSTRAP_MCS)'
-
 # Disting. We need to override $(distdir) here.
 
 package := mcs-$(VERSION)
@@ -44,7 +46,6 @@ DISTFILES = \
 	MIT.X11			\
 	MonoIcon.png		\
 	README			\
-	README.building		\
 	ScalableMonoIcon.svg	\
 	winexe.in
 
@@ -54,7 +55,9 @@ dist-pre:
 dist-post:
 	tar cvzf $(package).tar.gz $(package)
 
-dist-tarball: dist-pre dist-default dist-recursive dist-post
+dist-local: dist-default
+
+dist-tarball: dist-pre dist-recursive dist-post
 
 dist: dist-tarball
 	rm -rf $(package)
@@ -62,6 +65,9 @@ dist: dist-tarball
 # the egrep -v is kind of a hack (to get rid of the makefrags)
 # but otherwise we have to make dist then make clean which
 # is sort of not kosher. And it breaks with DIST_ONLY_SUBDIRS.
+#
+# We need to set prefix on make so class/System/Makefile can find
+# the installed System.Xml to build properly
 
 distcheck:
 	rm -rf InstallTest Distcheck-MCS ; \
@@ -70,8 +76,8 @@ distcheck:
 	$(MAKE) dist-tarball || exit 1 ; \
 	mv $(package) Distcheck-MCS ; \
 	(cd Distcheck-MCS && \
-	    make && make test && make install DESTDIR="$$destdir" && \
-	    make clean && make dist || exit 1) || exit 1 ; \
+	    $(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 ; \