[bcl] Specify the name of the key file on the command line instead of using the Assem...

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

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 6098d30328ca956a1ce60a8e42de908d74f88d35..a7e12930f1583eec9703fb232190f60a74e62b30 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -225,15 +225,15 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs \
        Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx
 
-RESX_DIST =  resources/TranslationResources.resx
-RESX_RES = $(RESX_DIST:.resx=.resources)
+RESOURCE_DEFS = \
+       TranslationResources,resources/TranslationResources.resx
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 NUNIT_APP_CODE_FILES = $(TEST_APP_CODE_FILES)
 NUNIT_APP_GLOBALRESOURCES_FILES = $(TEST_APP_GLOBALRESOURCES_FILES)
 
 OTHER_RES += $(RESOURCE_FILES_2)
-OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:618
+OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:436,618
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_RES += $(RESOURCE_FILES_4)
@@ -243,6 +243,7 @@ TXT_RESOURCE_STRINGS = ../referencesource/System.Web/System.Web.txt
 
 LIB_REFS = System System.Core System.Drawing System.Data System.Xml System.EnterpriseServices System.Runtime.Serialization.Formatters.Soap \
        System.ComponentModel.DataAnnotations System.Web.ApplicationServices System.Configuration Mono.Data.Sqlite
+KEYFILE = ../msfinal.pub
 LIB_MCS_FLAGS = \
        -unsafe \
        -nowarn:612,618 \
@@ -254,7 +255,7 @@ ifneq (plainweb/,$(intermediate))
 LIB_REFS += System.Web.Services plaindesign/System.Design
 LIB_MCS_FLAGS += -define:WEBSERVICES_DEP
 
-all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources 
+all-local: System.Web/UplevelHelper.cs 
 
 endif
 
@@ -272,7 +273,6 @@ EXTRA_DISTFILES = \
        $(TEST_APP_CODE_FILES) \
        $(TEST_APP_GLOBALRESOURCES_FILES) \
        UplevelHelperDefinitions.xml \
-       $(RESX_DIST) \
        SQLiteProviders_DatabaseSchema.sql \
        $(shell find Test/standalone-runner-support/ -name "*.cs" -type f -printf "'%p' ") \
        $(shell find Test/standalone-tests/ -name "*.cs" -type f -printf "'%p' " -o -name "*.cs.in" -type f -printf "'%p' ") \