X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b5079153b8e860031a83b0cfd7280824caf092e7;hb=11723d484d0e8ddfb185c98be4e86e3344dfc833;hp=c519486c3237a8111b0da44f5dd55323bf7a960e;hpb=ad62b1cc3400ec7b85464374baaaf4ff0c93b42b;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index c519486c323..b5079153b8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,50 +1,108 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono support docs data runtime scripts man samples web 
+MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
 
+if CROSS_COMPILING
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono docs data runtime scripts man samples support web tools
+DIST_SUBDIRS = po libgc eglib mono ikvm-native         data runtime scripts man samples tools msvc docs
+else
+if ONLY_MOONLIGHT
+SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
+else
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+# Keep in sync with SUBDIRS
+## 'tools' is not normally built
+DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+endif
+endif
+
+EXTRA_DIST= \
+	    LICENSE \
+	    autogen.sh \
+	    build-mingw32.sh \
+	    mkinstalldirs \
+	    mono-uninstalled.pc.in \
+	    nls.m4 \
+	    po.m4 \
+	    progtest.m4 \
+	    winconfig.h
 
-EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
+DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
 # Distribute the 'mcs' tree too
+GIT_DIR ?= $(srcdir)/.git
 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
+	test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
 
 pkgconfigdir = $(libdir)/pkgconfig
-if JIT_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc
-else
-pkgconfig_DATA= mint.pc
-endif
-DISTCLEANFILES= mono.pc mint.pc
-
-.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
+noinst_DATA = mono-uninstalled.pc
+DISTCLEANFILES= mono-uninstalled.pc
 
 # building with monolite
 mcslib = $(mcs_topdir)/class/lib
 monolite = $(mcslib)/monolite
+mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
+monolite_url = http://mono.ximian.com/daily/monolite-$(mono_corlib_version)-latest.tar.gz
+.PHONY: get-monolite-latest 
 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:
+.PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
+validate: do-build-mono-mcs
+	$(MAKE) mcs-do-tests
+do-build-mono-mcs: mcs-do-clean
+	$(MAKE) all
+mcs-do-clean:
 	cd runtime && $(MAKE) clean-local
-	$(MAKE)
-	$(MAKE) mcs-do-compiler-tests
+	cd mono/tests && $(MAKE) clean
+mcs-do-tests:
+	cd runtime && $(MAKE) check-local
+	cd mono/tests && $(MAKE) check
 
+.PHONY: compiler-tests mcs-do-compiler-tests
+compiler-tests:
+	$(MAKE) test_select='TEST_SUBDIRS="tests errors"' validate
+mcs-do-compiler-tests:
+	$(MAKE) test_select='TEST_SUBDIRS="tests errors"' mcs-do-tests
+
+.PHONY: bootstrap-world
 bootstrap-world: compiler-tests
 	$(MAKE) install
 
-# internal targets
-mcs-do-compiler-tests:
-	cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
+if MOONLIGHT
+moon-do-build: config.h
+	@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
+	  case "x$$subdir" in \
+		xmono ) target="moon-do-build";; \
+		* ) target="all";; \
+	  esac; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
+        done;
+	(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build)
+
+moon-do-clean:
+	@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
+	  case "x$$subdir" in \
+		xmono ) target="moon-do-clean";; \
+		* ) target="clean";; \
+	  esac; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
+        done;
+	(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean)
+
+endif
 
 win32getdeps:
 	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
@@ -53,18 +111,39 @@ win32getdeps:
 	wget http://www.go-mono.com/archive/libiconv-1.7.zip 
 	wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip 
 	wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
-	wget http://www.jroith.de/nsis4cygwin.zip
 	unzip -n -d / pkgconfig-0.11-20020310.zip
 	unzip -n -d / glib-2.0.4-20020703.zip
 	unzip -n -d / glib-dev-2.0.4-20020703.zip
 	unzip -n -d / libiconv-1.7.zip
 	unzip -n -d / libiconv-dev-1.7.zip
 	unzip -n -d / libintl-0.10.40-20020101.zip
-	unzip -n -d / nsis4cygwin.zip
 
 win32setup:
 	makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
 
-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