X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=65830f1a7b1f3cbd11e956140c3ad6c135b619a8;hb=582b946eb0b24423f5db353e37689a0c401673a7;hp=587ed44b1f4e89c3a36c645b500fbc39f42dc5fa;hpb=cccbf6a4b7152c24fafc319e77060a4723a8560e;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 587ed44b1f4..65830f1a7b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web 
+SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools 
+DIST_SUBDIRS = libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
 
-vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
-
-EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in mono-cairo.pc.in LICENSE $(vs_files)
+EXTRA_DIST= mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -17,30 +15,24 @@ DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 dist-hook:
 	test -d $(distdir)/mcs || mkdir $(distdir)/mcs
 	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
+	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
-if JIT_SUPPORTED
-if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc
-else
-pkgconfig_DATA= mono.pc dotnet.pc mono-cairo.pc
-endif
-else
-pkgconfig_DATA= mint.pc mono-cairo.pc
-endif
 noinst_DATA = mono-uninstalled.pc
-DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc mono-cairo.pc
+DISTCLEANFILES= mono-uninstalled.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
 # building with monolite
 mcslib = $(mcs_topdir)/class/lib
 monolite = $(mcslib)/monolite
+monolite_url = http://mono.ximian.com/daily/monolite-latest.tar.gz
 get-monolite-latest:
 	-rm -fr $(mcslib)/monolite-*
+	-mkdir -p $(mcslib)
 	test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
 	test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
-	cd $(mcslib) && { wget -O- http://www.go-mono.com/daily/monolite-latest.tar.gz | gzip -d | tar xf - ; }
+	cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
 	cd $(mcslib) && mv -f monolite-* monolite
 
 compiler-tests: mcs-do-clean
@@ -90,3 +82,7 @@ win32setup:
 bootstrap: all
 	@echo "*** 'make bootstrap' is obsolete.  Just run 'make' to perform a combined mono+mcs build"
 	exit 1
+
+patch-quiet:
+	find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
+	find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;