Fixed build breakage from my previous commit

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b90fd6741967e1218550ed9fc46f3b1884643ce2..6a0fcdcb0ae8ad7dba3bbcf9e8a88c4c4c3c7f29 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 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,6 +9,9 @@ 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_MONOTOUCH
+SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
+else
 if ONLY_MOONLIGHT
 SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
 else
@@ -17,6 +21,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
 
@@ -112,6 +117,31 @@ moon-do-clean:
 
 endif
 
+if INSTALL_MONOTOUCH
+monotouch-do-build: config.h
+       @list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
+         case "x$$subdir" in \
+               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) monotouch-do-build)
+
+monotouch-do-clean:
+       @list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
+         case "x$$subdir" in \
+               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) monotouch-do-clean)
+
+endif
+
 win32getdeps:
        wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
        wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip 
@@ -131,6 +161,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 +171,17 @@ 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
+