2009-08-13 Atsushi Enomoto <atsushi@ximian.com>

	* class/System.Json/Makefile: add System.Json to net_4_0 profile.

	* class/Makefile : update profile check.

svn path=/trunk/mcs/; revision=139835

diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 29410a99025ba2d31e01f1dcaa58bdb02dac7536..6f7745032444f940c6c8b7acf18c88deacdc5371 100644 (file)
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-13  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Makefile: add System.Json to net_4_0 profile.
+
 2009-07-20  Jb Evain  <jbevain@novell.com>
 
        * Makefile: set monotouch_SUBDIRS to the net_2_1 assemblies set.

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index f957e1558ae9a3788e190e7f31426bf1f5ac41f3..e9d10748bb7a1c98ddb6bb6a1a6d844f323b2621 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -158,6 +158,7 @@ net_3_5_dirs := \
 
 net_4_0_dirs := \
        System.Dynamic          \
+       System.Json             \
        Microsoft.CSharp
 
 net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI

diff --git a/mcs/class/System.Json/ChangeLog b/mcs/class/System.Json/ChangeLog
index 9b7630ac3bdda5d57cad5fcd26b6e64d4696f716..44919b9bb373f5e94563d682882fe18bff166262 100644 (file)
--- a/mcs/class/System.Json/ChangeLog
+++ b/mcs/class/System.Json/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-13  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Makefile : update profile check.
+
 2008-06-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * System.Json.dll.sources, Makefile : initial checkin.

diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index 5348b3a87052add4fcd66702a92fce8c4fa657f7..52f4f7d0cf35a6e902c4a4685e76c1e38f940e0b 100644 (file)
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -11,7 +11,8 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-ifneq (net_2_1, $(PROFILE))
+VALID_PROFILE := $(filter 2.1 4.0, $(FRAMEWORK_VERSION))
+ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Json.dll
 NO_INSTALL = yes
 NO_SIGN_ASSEMBLY = yes