[System.IO.KeventWatcher] Fix handling some cases where an item is moved out of the...

[mono.git] / mcs / class / System.Web.WebPages.Razor / Makefile

diff --git a/mcs/class/System.Web.WebPages.Razor/Makefile b/mcs/class/System.Web.WebPages.Razor/Makefile
index 460e08cce107e2ae04bd18185cac7c8a0a42cece..cb0e52dc33b38cb2347e8df99f1dd4e8341dd77d 100644 (file)
--- a/mcs/class/System.Web.WebPages.Razor/Makefile
+++ b/mcs/class/System.Web.WebPages.Razor/Makefile
@@ -5,47 +5,24 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.Razor.dll
 LIBRARY_NAME = System.Web.WebPages.Razor.dll
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src
-RESX_DIST = \
-       $(UPSTREAM_DIR)/System.Web.WebPages.Razor/Resources/RazorWebResources.resx \
-       $(UPSTREAM_DIR)/CommonResources.resx
-
-RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources))
+System.Web.WebPages.Razor.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
+       $(RESGEN) "$<" "$@"
+       
+System.Web.WebPages.Razor.Resources.RazorWebResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
+       $(RESGEN) "$<" "$@"
 
+LIB_REFS = System System.Core System.Configuration System.Web System.Web.WebPages System.Web.Razor
 LIB_MCS_FLAGS = \
                /warn:1 \
-               /noconfig \
                /keyfile:../winfx.pub \
                /delaysign \
-               /r:System.dll \
-               /r:System.Core.dll \
-               /r:System.Configuration.dll \
-               /r:System.Web.dll \
-               /r:System.Web.WebPages.dll \
-               /r:System.Web.Razor.dll \
                /d:ASPNETWEBPAGES \
-               $(RESOURCES:%=/resource:%)
-
-EXTRA_DISTFILES = $(RESX_DIST)
+               /resource:System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
+               /resource:System.Web.WebPages.Razor.Common.CommonResources.resources
 
 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_lib): System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
+               System.Web.WebPages.Razor.Common.CommonResources.resources
 
-$(build_libdir)/System.Web.WebPages.Razor/Resources/RazorWebResources.resources: $(UPSTREAM_DIR)/System.Web.WebPages.Razor/Resources/RazorWebResources.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)`