X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=af638365a062d49cb26b6e7cd6395e664ba952cd;hb=661af380c3894bbbd067937a02ae105dd1c7c85c;hp=b90fd6741967e1218550ed9fc46f3b1884643ce2;hpb=0a1e3ddf05121c7a43349babb5915db3eb1da4c6;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index b90fd674196..af638365a06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
+MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
 
 if CROSS_COMPILING
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
@@ -8,8 +8,11 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man
 ## 'tools' is not normally built
 DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
 else
-if ONLY_MOONLIGHT
-SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
+if ONLY_MONOTOUCH
+SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
+else
+if ONLY_XAMMAC
+SUBDIRS = $(libgc_dir) eglib/src mono 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
@@ -17,6 +20,7 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scr
 DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
+endif
 
 all: update_submodules
 
@@ -27,6 +31,7 @@ update_submodules:
 .PHONY: update_submodules
 
 EXTRA_DIST= \
+        README.md \
 	    LICENSE \
 	    autogen.sh \
 	    build-mingw32.sh \
@@ -87,28 +92,28 @@ 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 \
+if INSTALL_MONOTOUCH
+monotouch-do-build: config.h
+	@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
 	  case "x$$subdir" in \
-		xmono ) target="moon-do-build";; \
+		xmono ) target="monotouch-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)
+	(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-build)
 
-moon-do-clean:
-	@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
+monotouch-do-clean:
+	@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
 	  case "x$$subdir" in \
-		xmono ) target="moon-do-clean";; \
+		xmono ) target="monotouch-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)
+	(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-clean)
 
 endif
 
@@ -131,6 +136,8 @@ win32setup:
 
 update-csproj:
 	-rm msvc/scripts/order 
+	-rm msvc/scripts/order.xml
+	-rm -rf msvc/scripts/inputs
 	-mkdir msvc/scripts/inputs
 	(cd runtime; make V=1 extra_targets=csproj-local)
 
@@ -139,16 +146,23 @@ package-inputs:
 	echo '<root>' >> msvc/scripts/order.xml
 	for i in `cat msvc/scripts/order`; do \
 		set `echo $$i | sed -e 's/:/ /' -e 's/.input//'`; \
-		cat msvc/scripts/inputs/$$2.input | \
+		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>$$built</built_sources>"; \
+		 read built;  echo "      <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
 		 read libou;  echo "      <library_output>$$libou</library_output>"; \
 		 read fx_ver; echo "      <fx_version>$$fx_ver</fx_version>"; \
+		 read profile; echo "      <profile>$$profile</profile>"; \
 		 read resp;   echo "      <response>$$resp</response>"; \
-		echo "    </project>") >> msvc/scripts/order.xml; \
+		 echo "    </project>") >> msvc/scripts/order.xml; \
 	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."
+
+