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

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

diff --git a/mcs/class/System.Web.DynamicData/Makefile b/mcs/class/System.Web.DynamicData/Makefile
index 2797e796bbaad730c406322c60ef9517f9326670..a256a4f4234670a716ddba35a3cf57ff21b30bbc 100644 (file)
--- a/mcs/class/System.Web.DynamicData/Makefile
+++ b/mcs/class/System.Web.DynamicData/Makefile
@@ -3,20 +3,12 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Web.DynamicData.dll
-LIB_MCS_FLAGS = \
-               /r:System.dll \
-               /r:System.Core.dll \
-               /r:System.ComponentModel.DataAnnotations.dll \
-               /r:System.Data.dll \
-               /r:System.Data.Linq.dll \
-               /r:System.Drawing.dll \
-               /r:System.Web.dll \
-               /r:System.Web.Extensions.dll \
-               /r:System.Web.Abstractions.dll \
-               /r:System.Web.Routing.dll
+LIB_REFS = System System.Core System.ComponentModel.DataAnnotations System.Data System.Data.Linq System.Drawing System.Web System.Web.Extensions System.Web.Abstractions System.Web.Routing
+KEYFILE = ../winfx.pub
+LIB_MCS_FLAGS =
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
+LIB_REFS += System.Web.ApplicationServices
 endif
 
 # Use genresources.sh to generate the list below
@@ -165,28 +157,17 @@ TEST_RESOURCE_FILES = \
        Test/WebPages/Site.css,MonoTests.WebPages.Site.css      \
        Test/WebPages/Site.master,MonoTests.WebPages.Site.master        \
        Test/WebPages/Site.master.cs,MonoTests.WebPages.Site.master.cs  \
-       Test/WebPages/web.config.2.0,MonoTests.WebPages.web.config.2.0 \
-       Test/WebPages/web.config.4.0,MonoTests.WebPages.web.config.4.0 \
-       Test/WebPages/web.config.4.5,MonoTests.WebPages.web.config.4.5
+       Test/WebPages/web.config.4.x,MonoTests.WebPages.web.config.4.x
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll \
-       $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll -r:System.Xml.dll
+TEST_LIB_REFS = System.ComponentModel.DataAnnotations System.Configuration SystemWebTestShim System.Xml
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(NUNIT_RESOURCE_FILES:%=/resource:%)
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-TEST_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
+TEST_LIB_REFS += System.Web.ApplicationServices
 endif
 
 EXTRA_DISTFILES = $(foreach resource,$(TEST_RESOURCE_FILES), $(shell echo $(subst \`,\\\`,$(resource)) | cut -d ',' -f 1))
 
-# This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_4_5, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Web.DynamicData.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
 include ../../build/library.make