X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=f70d4d20241c5d8c50d52fbd903dc744ba69902f;hb=1d63c5debc23167e6310700cefbdb22813c32acf;hp=eaa758d8a057f0dec1c03407e714916ace6ba8d4;hpb=c251b192a55c255f278c9b9ad2ec949264a36526;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index eaa758d8a05..f70d4d20241 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,6 +1,3 @@
-# hack to prevent 'check' from depending on 'all'
-AUTOMAKE_OPTIONS = cygnus
-
 tmpinst = _tmpinst
 
 noinst_SCRIPTS = mono-wrapper monodis-wrapper
@@ -34,17 +31,18 @@ moon-do-basic-clean:
 	cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean
 endif
 
+if ONLY_MONOTOUCH
+build_profiles = monotouch
+else
 if ONLY_MOONLIGHT
 build_profiles = moonlight_raw
 test_profiles = moonlight_raw
 else
 
-build_profiles = net_2_0 net_3_5
-test_profiles = $(build_profiles)
+build_profiles = 
 
 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
@@ -57,12 +55,19 @@ moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
 
 endif
 
+if INSTALL_2_0
+build_profiles += net_2_0 net_3_5
+al_profile = net_2_0
+endif
+
 if INSTALL_4_0
-build_profiles += net_4_0 net_4_5
+build_profiles += net_4_0
+al_profile = net_4_0
+endif
+
+if INSTALL_4_5
+build_profiles += net_4_5
 al_profile = net_4_5
-#test_profiles += net_4_0
-else
-al_profile = net_2_0
 endif
 
 if INSTALL_MONODROID
@@ -70,21 +75,22 @@ build_profiles += monodroid
 endif
 
 if INSTALL_MONOTOUCH
-build_profiles += monotouch
+build_profiles += monotouch monotouch_runtime
 endif
 
-if INSTALL_MOBILE
-build_profiles += mobile
-endif
+test_profiles = $(build_profiles)
 
+endif
 endif
 
 if BUILD_MCS
 
+MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
+
 # The write check is to foil 'make distcheck'
 all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
 	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
-	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+	cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
 
 # override automake
 install: install-exec install-data
@@ -139,12 +145,12 @@ endif
 
 # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
 # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
-# Skip net 2.1 assemblies for now because of visibility problems
+# Skip net 4.0 assemblies because the contain metadata only
 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 [ "moonlight" = "$$profile" ]; then \
-          break; \
+	  if [ "net_4_0" = "$$profile" ]; then \
+          continue; \
       fi; \
 	  if [ "net_3_5" = "$$profile" ]; then \
 		  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
@@ -166,6 +172,9 @@ mcs-compileall: mono-wrapper etc/mono/config
 check-local: mcs-compileall mcs-do-test-profiles
 	$(MAKE) $(test_select) mcs-do-run-test-profiles
 
+# Compile all mcs tests
+test: mcs-do-test-profiles
+
 CLEANFILES = etc/mono/config
 
 # depend on $(symlinks) to ensure 'etc/mono' directory exists