[x86] Emit the push/pop LMF code as IR on osx.

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 51d421a68ebbc998cbb7a16226936165fe5a0049..a4a959d1c48b94c3eaecdcb78bc8b6d937f7fdc6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
 
-MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
 MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
 
 if CROSS_COMPILING
@@ -12,16 +11,12 @@ else
 if ONLY_MONOTOUCH
 SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
 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 = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
-endif
 
 all: update_submodules
 
@@ -32,6 +27,7 @@ update_submodules:
 .PHONY: update_submodules
 
 EXTRA_DIST= \
+        README.md \
            LICENSE \
            autogen.sh \
            build-mingw32.sh \
@@ -92,31 +88,6 @@ mcs-do-compiler-tests:
 bootstrap-world: compiler-tests
        $(MAKE) install
 
-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
-
 if INSTALL_MONOTOUCH
 monotouch-do-build: config.h
        @list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
@@ -174,7 +145,6 @@ package-inputs:
                cat msvc/scripts/inputs/$$2.input | sed -e 's/\\\\/\\/g' -e 's/\\/\\\\/g' | \
                (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>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
@@ -186,3 +156,9 @@ package-inputs:
        done
        echo "</root>" >> msvc/scripts/order.xml
 
+# Update llvm version in configure.in to the output of $LLVM_DIR/bin/llvm-config --version
+update-llvm-version:
+       if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
+       REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.in > tmp && mv tmp configure.in && echo "Version set to $$REV."
+
+