X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=ace9b2dca35a9d961b5b9f501c878f3e6f29eaf8;hb=f3443a829d85c505114cdcca7e88cb8dd1e299e8;hp=587ed44b1f4e89c3a36c645b500fbc39f42dc5fa;hpb=9869ae24b88761ab261c4311e24f7383b4af3f02;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 587ed44b1f4..ace9b2dca35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,51 +1,40 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web 
+SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
 
 # 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 = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
 
-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= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
 # Distribute the 'mcs' tree too
 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) 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
-	$(MAKE) all
-	$(MAKE) mcs-do-compiler-tests
+compiler-tests: build-test-mono-mcs-moon
 
 compiler-tests-net_2_0:
 	-rm -f $(mcs_topdir)/build/common/Consts.cs.save
@@ -54,7 +43,7 @@ compiler-tests-net_2_0:
 	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
 	-mv -f $(mcs_topdir)/build/common/Consts.cs.save $(mcs_topdir)/build/common/Consts.cs
 	$(MAKE) all
-	$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
+	$(MAKE) test_profiles=net_2_0 mcs-do-compiler-tests
 
 bootstrap-world: compiler-tests
 	$(MAKE) install
@@ -63,6 +52,18 @@ bootstrap-world-net_2_0: compiler-tests-net_2_0
 	$(MAKE) install
 
 # internal targets
+.PHONY: build-test-mono-mcs-moon
+build-test-mono-mcs-moon: do-build-moon-maybe
+	$(MAKE) mcs-do-compiler-tests
+
+.PHONY: do-build-mono-mcs
+do-build-mono-mcs: mcs-do-clean
+	$(MAKE) all
+
+.PHONY: do-build-moon-maybe
+do-build-moon-maybe: do-build-mono-mcs
+	cd runtime && $(MAKE) moon-do-build
+
 mcs-do-clean:
 	cd runtime && $(MAKE) clean-local
 	cd mono/tests && $(MAKE) clean
@@ -90,3 +91,30 @@ 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 {} \;
+
+update-csproj:
+	-rm msvc/scripts/order 
+	-mkdir msvc/scripts/inputs
+	(cd runtime; make V=1 extra_targets=csproj-local)
+
+package-inputs:
+	echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
+	echo '<root>' >> msvc/scripts/order.xml
+	for i in `cat msvc/scripts/order`; do \
+		set `echo $$i | sed -e 's/:/ /' -e 's/.input//'`; \
+		cat msvc/scripts/inputs/$$2.input | \
+		(echo "    <project dir=\"$$1\" library=\"$$2\">"; \
+		 read boot;   echo "      <boot>$$boot</boot>"; \
+		 read mcs;    echo "      <mcs>$$mcs</mcs>"; \
+		 read flags;  echo "      <flags>$$flags</flags>"; \
+		 read output; echo "      <output>$$output</output>"; \
+		 read built;  echo "      <built_sources>$$built</built_sources>"; \
+		 read libou;  echo "      <library_output>$$libou</library_output>"; \
+		 read resp;   echo "      <response>$$resp</response>"; \
+		echo "    </project>") >> msvc/scripts/order.xml; \
+	done
+	echo "</root>" >> msvc/scripts/order.xml