Remove old System.Json sources

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

diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index f3845bcac0079876980ddbfaf615e4615b3565da..fe4c4837f4ab3c76a10b04e07a1cc1c573de939b 100644 (file)
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -2,18 +2,19 @@ thisdir = class/System.Json
 SUBDIRS = 
 include ../../build/rules.make
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src/System.Json/Properties
-RESX_RESOURCES = $(UPSTREAM_DIR)/Resources.resx
-RESOURCES = $(RESX_DIST:.resx=.resources)
+UPSTREAM_DIR = ../../../external/aspnetwebstack/src
+RESX_RESOURCES = $(UPSTREAM_DIR)/System.Json/Properties/Resources.resx
+RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_RESOURCES:.resx=.resources))
 
 LIBRARY = System.Json.dll
 LIB_MCS_FLAGS = \
+               /d:ASPNETMVC \
                /r:System.dll \
                /r:System.Xml.dll \
                /r:System.Core.dll \
                /r:System.Runtime.Serialization.dll \
                /r:System.ServiceModel.Web.dll \
-               $(RESX_RES:%=/resource:%)
+               $(RESOURCES:%=/resource:%)
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll
@@ -36,5 +37,14 @@ include ../../build/library.make
 
 $(the_lib): $(RESOURCES)
 
-$(RESOURCES):  %.resources: %.resx
-       $(RESGEN) $< || cp $@.prebuilt $@
+# Canned recipe which would be useful, but make doesn't run it for some reason...
+#define run-resgen = 
+#      mkdir -p $(dir $@)
+#      $(RESGEN) $< $@
+#endef
+
+$(build_libdir)/System.Json/Properties/Resources.resources: $(UPSTREAM_DIR)/System.Json/Properties/Resources.resx
+#      Doesn't work for some reason
+#      $(run-resgen)
+       mkdir -p $(dir $@)
+       $(RESGEN) $< $@