[xbuild] Fix bug #674630.

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 412dac83cc708870c5ae3eaa44b0bc0613cd42e9..dde00adef647541e718a6758f25cf315d16da592 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -8,23 +8,51 @@ noinst_SCRIPTS = mono-wrapper monodis-wrapper
 etctmp = etc
 symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
 
-etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
+if INSTALL_4_0
+symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config
+endif
+
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
 etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
 etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser
+etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
+etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
 
 $(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
-build_profiles = net_1_1
+if MOONLIGHT
+moon-do-basic: Makefile $(SUPPORT_FILES)
+       cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw
+
+moon-do-basic-clean:
+       cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean
+endif
+
+if ONLY_MOONLIGHT
+build_profiles = moonlight_raw
+test_profiles = moonlight_raw
+else
+
+build_profiles = net_2_0 net_3_5
 test_profiles = $(build_profiles)
 
-if INSTALL_2_0
-build_profiles += net_2_0 net_3_5
-test_profiles += net_2_0 net_3_5
+if MOONLIGHT
+build_profiles += moonlight_raw
+test_profiles += moonlight_raw
+
+moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
+
+moon-do-moonlight-raw-clean:
+       cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
+
+moon-do-build: moon-do-moonlight-raw moon-do-basic
+moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
+
 endif
 
 if INSTALL_4_0
@@ -32,9 +60,14 @@ build_profiles += net_4_0
 #test_profiles += net_4_0
 endif
 
-if INSTALL_2_1
-build_profiles += net_2_1_raw
-test_profiles += net_2_1_raw
+if INSTALL_MONODROID
+build_profiles += monodroid
+endif
+
+if INSTALL_MONOTOUCH
+build_profiles += monotouch
+endif
+
 endif
 
 if BUILD_MCS
@@ -67,7 +100,7 @@ clean-local:
 
 endif BUILD_MCS
 
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 
 # now a misnomer, but it'll go away soon enough.
 if ENABLE_NUNIT_TESTS
@@ -76,21 +109,13 @@ else
 test_select = ONLY_CENTUM_TESTS=yes
 endif
 
-if INSTALL_2_1
-moon-do-build: test-support-files
-       cd $(top_builddir)/../moon/class && $(MAKE) all
-else
-moon-do-build:
-       @:
-endif
-
 mcs-do-test-profiles:
        cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
        cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles
 
-if PLATFORM_WIN32
+if HOST_WIN32
 if CROSS_COMPILING
 cur_dir_cmd = pwd
 PLATFORM_PATH_SEPARATOR = :
@@ -109,7 +134,7 @@ endif
 mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
-         if [ "net_2_1" = "$$profile" ]; then \
+         if [ "moonlight" = "$$profile" ]; then \
           break; \
       fi; \
          if [ "net_3_5" = "$$profile" ]; then \
@@ -150,13 +175,19 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
 $(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
        echo '#! /bin/sh' > $@ ; \
        r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
-       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_1_1/mcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
        chmod +x $@
 
 $(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile
        echo '#! /bin/sh' > $@ ; \
        r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
-       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/gmcs.exe"'" "$$@"' >> $@ ; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe -sdk:2"'" "$$@"' >> $@ ; \
+       chmod +x $@
+
+$(tmpinst)/bin/dmcs: $(tmpinst)/bin/mono Makefile
+       echo '#! /bin/sh' > $@ ; \
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe -sdk:4"'" "$$@"' >> $@ ; \
        chmod +x $@
 
 $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
@@ -165,6 +196,18 @@ $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
        echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
        chmod +x $@
 
+$(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
+       echo '#! /bin/sh' > $@ ; \
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \
+       chmod +x $@
+
+$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
+       echo '#! /bin/sh' > $@ ; \
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+       echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_4_0/al.exe"'" "$$@"' >> $@ ; \
+       chmod +x $@
+
 test-support-files: $(TEST_SUPPORT_FILES)
        @: