X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b5079153b8e860031a83b0cfd7280824caf092e7;hb=6f4c53862b2879c731c0f65d1f3af34399ed6008;hp=573238e9a8f6cc782d0ae1414718abfbc628a394;hpb=c4695a800c5fa71609ab27b2bd443a00c414c054;p=mono.git diff --git a/Makefile.am b/Makefile.am index 573238e9a8f..b5079153b8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,43 +1,54 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -MOONLIGHT_SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) data +MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono if CROSS_COMPILING -SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) data runtime scripts man samples web msvc $(docs_dir) +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 = po libgc eglib mono ikvm-native data runtime scripts man samples web tools msvc docs +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_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir) +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 web tools msvc docs +DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs endif endif -EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh +EXTRA_DIST= \ + LICENSE \ + autogen.sh \ + build-mingw32.sh \ + mkinstalldirs \ + mono-uninstalled.pc.in \ + nls.m4 \ + po.m4 \ + progtest.m4 \ + winconfig.h 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) distdir=$$d dist-recursive + test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry pkgconfigdir = $(libdir)/pkgconfig noinst_DATA = mono-uninstalled.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 +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) @@ -46,54 +57,52 @@ 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 +.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 - $(MAKE) test_profiles=net_2_0 mcs-do-compiler-tests +mcs-do-clean: + cd runtime && $(MAKE) clean-local + cd mono/tests && $(MAKE) clean +mcs-do-tests: + cd runtime && $(MAKE) check-local + cd mono/tests && $(MAKE) check -bootstrap-world: compiler-tests - $(MAKE) install +.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 -bootstrap-world-net_2_0: compiler-tests-net_2_0 +.PHONY: bootstrap-world +bootstrap-world: compiler-tests $(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 - if MOONLIGHT moon-do-build: config.h @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \ - echo "Making all in $$subdir"; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all); \ + 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 $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw all + (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build) moon-do-clean: @list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \ - echo "Making clean in $$subdir"; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean); \ + 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 $(mcs_topdir) && NO_DIR_CHECK=1 $(MAKE) PROFILE=moonlight_raw clean -endif + (cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean) -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 - cd mono/tests && $(MAKE) check +endif win32getdeps: wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip @@ -112,10 +121,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 {} \;