Merge pull request #2768 from lambdageek/dev/monoerror-cominterop

[mono.git] / mono / Makefile.am

diff --git a/mono/Makefile.am b/mono/Makefile.am
index 2fd5417347b0da07f2972ba751a5f5d19973c26a..7bf7b5c3dedfa0122abb5dba36dd6120370cb231 100644 (file)
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,8 +1,12 @@
+if SUPPORT_SGEN
+sgen_dirs = sgen
+endif
+
 if CROSS_COMPILING
-SUBDIRS = arch utils io-layer cil metadata $(interpreter_dir) mini dis
+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis profiler
 else
 if INSTALL_MONOTOUCH
-SUBDIRS = utils io-layer metadata arch mini
+SUBDIRS = arch utils io-layer metadata $(sgen_dirs) mini profiler
 
 monotouch-do-build:
        @list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -26,34 +30,7 @@ monotouch-do-clean:
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
     done;
 else
-if MOONLIGHT
-SUBDIRS = arch utils io-layer metadata mini
-
-moon-do-build:
-       @list='$(SUBDIRS)'; for subdir in $$list; do \
-         case "x$$subdir" in \
-               xmetadata ) target="moon-do-build" ;; \
-               xmini ) target="moon-do-build" ;; \
-               * ) target="all" ;; \
-         esac; \
-         echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
-    done;
-
-moon-do-clean:
-       @list='$(SUBDIRS)'; for subdir in $$list; do \
-         case "x$$subdir" in \
-               xmetadata ) target="moon-do-clean" ;; \
-               xmini ) target="moon-do-clean" ;; \
-               * ) target="clean" ;; \
-         esac; \
-         echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
-    done;
-
-else
-SUBDIRS = arch utils io-layer cil metadata $(interpreter_dir) mini dis monograph tests benchmark profiler
-endif
+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
 endif
 endif
-DIST_SUBDIRS = arch utils io-layer cil metadata interpreter mini dis monograph tests benchmark profiler
+DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler