This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index da482b27e7b0d885dc889ab8d37ba2ce3c4bfd60..eaa4952f2ce93022fb74c0b1e4dd42027b8a290d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ MCS_BASIC_FILES = \
 MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger
 MCS_FILES = $(MCS_BASIC_FILES) \
        $(mcs_topdir)/class/lib/default/System.Xml.dll \
-       $(mcs_topdir)/class/lib/default/Mono.CompilerServices.SymbolWriter.dll
+       $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
 
 tmpinst = _tmpinst
 
@@ -91,12 +91,6 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
        $(MAKE) tmpinst-mcs-short-build
        $(MAKE) fasterstrap
 
-bootstrap-world:
-       $(MAKE) bootstrap-clean
-       $(MAKE) bootstrap
-       $(MAKE) install
-       $(MAKE) mcs-do-compiler-tests
-
 # internal targets
 
 tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir
@@ -124,14 +118,14 @@ mono-do-runtime-only: $(CONFIG_HEADER)
 mcs-do-basic-build:
        rm -f $(MCS_FILES)
        for dir in $(MCS_BASIC_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
+         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
        done
 
 mcs-do-short-build:
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH; export PATH ; \
        for dir in $(MCS_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \
+         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default) || exit 1 ; \
        done
 
 mcs-do-full-build:
@@ -142,14 +136,11 @@ mcs-do-full-build:
 mcs-do-clean-profiles:
        cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test: tmpinst-dir $(tmpinst)/bin/mbas
+mcs-do-run-test: tmpinst-dir
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
        cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
 
-mcs-do-compiler-tests:
-       cd $(mcs_topdir) && $(MAKE) test-compiler
-
 populate-runtime-subdir:
        test -n '$(populate_profiles)'
        @srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \
@@ -160,16 +151,15 @@ populate-runtime-subdir:
            cd $(mcs_topdir) && \
            $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install ) || exit 1 ; \
        done
-       find $(tmpinst)/prefix -type f -name '*jay*' -exec rm -f '{}' ';'
-       for i in `find $(tmpinst)/prefix -type d -name '*jay*' -print`; do rm -f $$i/*; done
+       find $(tmpinst)/prefix -type f -path '*/jay*' -exec rm -f '{}' ';'
        test -z "`find $(tmpinst)/prefix -type f -print`"
        rm -rf $(tmpinst)/prefix
 
 tmpinst-dir: 
-       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0
+       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
        $(MAKE) tmpinst-dir-contents
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
 
 if PLATFORM_WIN32
 
@@ -180,7 +170,7 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
        echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@
        echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@
        echo 'export MONO_PATH MONO_CFG_DIR' >> $@
-       echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@
+       echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/mono.exe" "$$@"' >> $@
        chmod +x $@
 
 else
@@ -200,15 +190,9 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
        (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
        chmod +x $@
 
-# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
-$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
-       t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
-       ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/mbas.exe"'" "$$@"' ) > $@
-       chmod +x $@
-
-$(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config
+$(tmpinst)/etc/mono/machine.config: $(srcdir)/data/machine.config
        rm -f $@
-       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config
+       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono && $(LN_S) $$srcdir/data/machine.config machine.config
 
 # Obsolete target -- don't use.
 .PHONY: fullbuild