Merge pull request #3066 from alexanderkyte/pedump_sgen

[mono.git] / mcs / class / System.Json.Microsoft / Makefile

diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile
index eb4b37f3497ccd30311ceb843a6602d7ddaa2ad8..2d13a176b82062e17226712e87b4dada3555eca8 100644 (file)
--- a/mcs/class/System.Json.Microsoft/Makefile
+++ b/mcs/class/System.Json.Microsoft/Makefile
@@ -2,28 +2,22 @@ thisdir = class/System.Json.Microsoft
 SUBDIRS = 
 include ../../build/rules.make
 
-System.Json.Properties.Resources.resources: System.Json/Properties/Resources.resx
+System.Json/Properties/Resources.resources: System.Json/Properties/Resources.resx
        $(RESGEN) "$<" "$@"
 
 LIBRARY = System.Json.Microsoft.dll
+LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
 LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
-               /r:System.dll \
-               /r:System.Xml.dll \
-               /r:System.Core.dll \
-               /r:System.Runtime.Serialization.dll \
-               /resource:System.Json.Properties.Resources.resources
+               /resource:System.Json/Properties/Resources.resources,System.Json.Properties.Resources.resources
 
 EXTRA_DISTFILES = System.Json/Properties/Resources.resx
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll -d:FEATURE_DYNAMIC
-endif
-
-ifeq (monodroid, $(PROFILE))
+LIB_REFS += Microsoft.CSharp
 LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
 endif
 
-ifeq (xammac, $(PROFILE))
+ifdef MOBILE_DYNAMIC
 LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
 endif
 
@@ -31,4 +25,4 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 include ../../build/library.make
 
-$(the_lib): System.Json.Properties.Resources.resources
+$(the_lib): System.Json/Properties/Resources.resources