Imported Upstream version 2.8upstream/2.8

1 files changed, 44 insertions, 44 deletions

diff --git a/Makefile.in b/Makefile.in
index f8a7b08e2c..0ce0096b8b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,6 +89,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BISON = @BISON@
+BOEHM_DEFINES = @BOEHM_DEFINES@
 BUILD_EXEEXT = @BUILD_EXEEXT@
 BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
 BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
@@ -130,7 +131,6 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-HAVE_BOEHM_GC = @HAVE_BOEHM_GC@
 HAVE_MSGFMT = @HAVE_MSGFMT@
 HOST_CC = @HOST_CC@
 INSTALL = @INSTALL@
@@ -162,6 +162,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
+MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -184,6 +185,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
+SGEN_DEFINES = @SGEN_DEFINES@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
 SQLITE3 = @SQLITE3@
@@ -221,7 +223,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 docs_dir = @docs_dir@
 dvidir = @dvidir@
-eglib_dir = @eglib_dir@
 exec_prefix = @exec_prefix@
 export_ldflags = @export_ldflags@
 host = @host@
@@ -272,11 +273,15 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
-
+MOONLIGHT_SUBDIRS = $(libgc_dir) eglib mono $(ikvm_native_dir)         data
+@CROSS_COMPILING_FALSE@@ONLY_MOONLIGHT_FALSE@SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
+@CROSS_COMPILING_FALSE@@ONLY_MOONLIGHT_TRUE@SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
+@CROSS_COMPILING_TRUE@SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples web msvc $(docs_dir)
+# Keep in sync with SUBDIRS
+@CROSS_COMPILING_FALSE@@ONLY_MOONLIGHT_FALSE@DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples web tools msvc docs
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
-EXTRA_DIST = nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs
+@CROSS_COMPILING_TRUE@DIST_SUBDIRS = po libgc eglib mono ikvm-native         data runtime scripts man samples web tools msvc docs
+EXTRA_DIST = nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
@@ -744,12 +749,12 @@ uninstall-am:
 
 
 # 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=net_1_1 distdir=$$d dist-recursive
-	d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 distdir=$$d dist-recursive
-
-.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
+	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
+.PHONY: get-monolite-latest 
 get-monolite-latest:
 	-rm -fr $(mcslib)/monolite-*
 	-mkdir -p $(mcslib)
@@ -758,43 +763,42 @@ get-monolite-latest:
 	cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
 	cd $(mcslib) && mv -f monolite-* monolite
 
-compiler-tests: build-test-mono-mcs-moon
-
-compiler-tests-net_2_0:
-	-rm -f $(mcs_topdir)/build/common/Consts.cs.save
-	-mv -f $(mcs_topdir)/build/common/Consts.cs $(mcs_topdir)/build/common/Consts.cs.save
-	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0_bootstrap clean
-	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) test_profiles=net_2_0 mcs-do-compiler-tests
-
-bootstrap-world: compiler-tests
-	$(MAKE) install
-
-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
+.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
-
-.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
-mcs-do-compiler-tests:
-	cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
+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
+
+@MOONLIGHT_TRUE@moon-do-build: config.h
+@MOONLIGHT_TRUE@	@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
+@MOONLIGHT_TRUE@	  echo "Making all in $$subdir"; \
+@MOONLIGHT_TRUE@	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all); \
+@MOONLIGHT_TRUE@        done;
+@MOONLIGHT_TRUE@	cd $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw all
+
+@MOONLIGHT_TRUE@moon-do-clean:
+@MOONLIGHT_TRUE@	@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
+@MOONLIGHT_TRUE@	  echo "Making clean in $$subdir"; \
+@MOONLIGHT_TRUE@	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean); \
+@MOONLIGHT_TRUE@        done;
+@MOONLIGHT_TRUE@	cd $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw clean
+
 win32getdeps:
 	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
 	wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip 
@@ -812,10 +816,6 @@ win32getdeps:
 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 {} \;