projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP [library.make] Make resource usage declarative in the class libraries (#3159)
[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 2d13a176b82062e17226712e87b4dada3555eca8..56c51c6330d93cd5a7c0dfa05716bdf170d4eb85 100644
(file)
--- a/
mcs/class/System.Json.Microsoft/Makefile
+++ b/
mcs/class/System.Json.Microsoft/Makefile
@@
-2,14
+2,11
@@
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
- $(RESGEN) "$<" "$@"
+RESOURCE_DEFS = System.Json.Properties.Resources,System.Json/Properties/Resources.resx
LIBRARY = System.Json.Microsoft.dll
LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
LIBRARY = System.Json.Microsoft.dll
LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
-LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
- /resource:System.Json/Properties/Resources.resources,System.Json.Properties.Resources.resources
-
+LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign
EXTRA_DISTFILES = System.Json/Properties/Resources.resx
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
EXTRA_DISTFILES = System.Json/Properties/Resources.resx
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
@@
-24,5
+21,3
@@
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make
-
-$(the_lib): System.Json/Properties/Resources.resources