projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 beb147c99139bcaa2ea05c5fe3b6566983def52f..2d13a176b82062e17226712e87b4dada3555eca8 100644
(file)
--- a/
mcs/class/System.Json.Microsoft/Makefile
+++ b/
mcs/class/System.Json.Microsoft/Makefile
@@
-2,30
+2,22
@@
thisdir = class/System.Json.Microsoft
SUBDIRS =
include ../../build/rules.make
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 \
$(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_REFS += Microsoft.CSharp
EXTRA_DISTFILES = System.Json/Properties/Resources.resx
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_REFS += Microsoft.CSharp
-LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll -d:FEATURE_DYNAMIC
-endif
-
-ifeq (monodroid, $(PROFILE))
LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
endif
LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
endif
-if
eq (xammac, $(PROFILE))
+if
def MOBILE_DYNAMIC
LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
endif
LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
endif
@@
-33,4
+25,4
@@
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make
include ../../build/library.make
-$(the_lib): System.Json
.Properties.
Resources.resources
+$(the_lib): System.Json
/Properties/
Resources.resources