Imported Upstream version 3.2.3+dfsgupstream/3.2.3+dfsg

2 files changed, 13 insertions, 72 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 93b44b4bdc..9270894682 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -23,38 +23,11 @@ $(symlinks):
 
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
-if MOONLIGHT
-moon-do-basic: Makefile $(SUPPORT_FILES)
-	cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw
-
-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 = 
 
-if MOONLIGHT
-build_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
-
-moon-do-moonlight-raw-clean:
-	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
-
-moon-do-build: moon-do-moonlight-raw moon-do-basic
-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
@@ -81,7 +54,6 @@ endif
 test_profiles = $(build_profiles)
 
 endif
-endif
 
 if BUILD_MCS
 
diff --git a/runtime/Makefile.in b/runtime/Makefile.in
index 8140f67bb1..ac3e30121b 100644
--- a/runtime/Makefile.in
+++ b/runtime/Makefile.in
@@ -52,12 +52,11 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @INSTALL_4_0_TRUE@am__append_1 = etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_2 = moonlight_raw
-@INSTALL_2_0_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_3 = net_2_0 net_3_5
-@INSTALL_4_0_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_4 = net_4_0
-@INSTALL_4_5_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_5 = net_4_5
-@INSTALL_MONODROID_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_6 = monodroid
-@INSTALL_MONOTOUCH_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@am__append_7 = monotouch monotouch_runtime
+@INSTALL_2_0_TRUE@@ONLY_MONOTOUCH_FALSE@am__append_2 = net_2_0 net_3_5
+@INSTALL_4_0_TRUE@@ONLY_MONOTOUCH_FALSE@am__append_3 = net_4_0
+@INSTALL_4_5_TRUE@@ONLY_MONOTOUCH_FALSE@am__append_4 = net_4_5
+@INSTALL_MONODROID_TRUE@@ONLY_MONOTOUCH_FALSE@am__append_5 = monodroid
+@INSTALL_MONOTOUCH_TRUE@@ONLY_MONOTOUCH_FALSE@am__append_6 = monotouch monotouch_runtime
 subdir = runtime
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/mono-wrapper.in $(srcdir)/monodis-wrapper.in \
@@ -180,7 +179,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
 MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
-MOONLIGHT_DEFINES = @MOONLIGHT_DEFINES@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -299,30 +297,16 @@ symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config \
 	etc/mono/2.0/web.config etc/mono/browscap.ini \
 	etc/mono/2.0/Browsers/Compat.browser $(am__append_1)
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@build_profiles =  \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_2) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_3) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_4) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_5) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_6) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	$(am__append_7)
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@build_profiles =  \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	moonlight_raw \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_2) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_3) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_4) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_5) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_6) \
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@	$(am__append_7)
+@ONLY_MONOTOUCH_FALSE@build_profiles = $(am__append_2) $(am__append_3) \
+@ONLY_MONOTOUCH_FALSE@	$(am__append_4) $(am__append_5) \
+@ONLY_MONOTOUCH_FALSE@	$(am__append_6)
 @ONLY_MONOTOUCH_TRUE@build_profiles = monotouch $(am__append_2) \
 @ONLY_MONOTOUCH_TRUE@	$(am__append_3) $(am__append_4) \
-@ONLY_MONOTOUCH_TRUE@	$(am__append_5) $(am__append_6) \
-@ONLY_MONOTOUCH_TRUE@	$(am__append_7)
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@test_profiles = $(build_profiles)
-@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_TRUE@test_profiles = moonlight_raw
-@INSTALL_2_0_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@al_profile = net_2_0
-@INSTALL_4_0_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@al_profile = net_4_0
-@INSTALL_4_5_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@al_profile = net_4_5
+@ONLY_MONOTOUCH_TRUE@	$(am__append_5) $(am__append_6)
+@INSTALL_2_0_TRUE@@ONLY_MONOTOUCH_FALSE@al_profile = net_2_0
+@INSTALL_4_0_TRUE@@ONLY_MONOTOUCH_FALSE@al_profile = net_4_0
+@INSTALL_4_5_TRUE@@ONLY_MONOTOUCH_FALSE@al_profile = net_4_5
+@ONLY_MONOTOUCH_FALSE@test_profiles = $(build_profiles)
 @BUILD_MCS_TRUE@MAKE_FLAGS = $(if $(V),,--no-print-directory -s)
 TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 @ENABLE_NUNIT_TESTS_FALSE@test_select = ONLY_CENTUM_TESTS=yes
@@ -521,21 +505,6 @@ etc/mono/4.5/web.config: $(top_srcdir)/data/net_4_5/web.config
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
-@MOONLIGHT_TRUE@moon-do-basic: Makefile $(SUPPORT_FILES)
-@MOONLIGHT_TRUE@	cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw
-
-@MOONLIGHT_TRUE@moon-do-basic-clean:
-@MOONLIGHT_TRUE@	cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean
-
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
-
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@moon-do-moonlight-raw-clean:
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
-
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@moon-do-build: moon-do-moonlight-raw moon-do-basic
-@MOONLIGHT_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_MOONLIGHT_FALSE@moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
-
 # The write check is to foil 'make distcheck'
 @BUILD_MCS_TRUE@all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
 @BUILD_MCS_TRUE@	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi