diff options
| author | Marek Safar <marek.safar@gmail.com> | 2012-03-30 19:41:17 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2012-03-30 19:41:17 +0400 |
| commit | 142d3ec25322f5beb4a82b2608c19cf7d651d967 (patch) | |
| tree | 493493072ebb1f9833baef256d678877320657fb /mcs/class/System.Web.WebPages | |
| parent | ac706e0db80aa08afd97fdf1aa95fa1b81137511 (diff) | |
Fix System.Web.Razor embedded resouces namespace
Diffstat (limited to 'mcs/class/System.Web.WebPages')
| -rw-r--r-- | mcs/class/System.Web.WebPages/Makefile | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile index 23bd17b7576..7bcf43bd983 100644 --- a/mcs/class/System.Web.WebPages/Makefile +++ b/mcs/class/System.Web.WebPages/Makefile @@ -5,12 +5,11 @@ include ../../build/rules.make LIBRARY = System.Web.WebPages.dll LIBRARY_NAME = System.Web.WebPages.dll -UPSTREAM_DIR = ../../../external/aspnetwebstack/src -RESX_DIST = \ - $(UPSTREAM_DIR)/System.Web.WebPages/Resources/WebPageResources.resx \ - $(UPSTREAM_DIR)/CommonResources.resx - -RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources)) +System.Web.WebPages.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx + $(RESGEN) "$<" "$@" + +System.Web.WebPages.Resources.WebPageResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx + $(RESGEN) "$<" "$@" LIB_MCS_FLAGS = \ /warn:1 \ @@ -30,28 +29,12 @@ LIB_MCS_FLAGS = \ /r:System.Xml.dll \ /r:System.Xml.Linq.dll \ /d:ASPNETWEBPAGES \ - $(RESOURCES:%=/resource:%) + /resource:System.Web.WebPages.Resources.WebPageResources.resources \ + /resource:System.Web.WebPages.Common.CommonResources.resources EXTRA_DISTFILES = $(RESX_DIST) include ../../build/library.make -$(build_lib): $(RESOURCES) - -# Canned recipe which would be useful, but make doesn't run it for some reason... -#define run-resgen = -# mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`) -# $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)` -#endef - -$(build_libdir)/System.Web.WebPages/Resources/WebPageResources.resources: $(UPSTREAM_DIR)/System.Web.WebPages/Resources/WebPageResources.resx -# Doesn't work for some reason -# $(run-resgen) - mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`) - $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)` - -$(build_libdir)/CommonResources.resources: $(UPSTREAM_DIR)/CommonResources.resx -# Doesn't work for some reason -# $(run-resgen) - mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`) - $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)` +$(build_lib): System.Web.WebPages.Resources.WebPageResources.resources \ + System.Web.WebPages.Common.CommonResources.resources |