2009-09-07 Marek Habersack <mhabersack@novell.com>

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

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 2a97a6d2f7d7b72c4724d91af3556ae3747202a9..fb2d7f2193b271076c9314187de4333fd0cea9f4 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -20,7 +20,7 @@ ifndef NO_SYSTEMCORE_DEP
 SYSTEMCORE_DEP := System.Core.dll
 SYSTEMCORE_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(SYSTEMCORE_DEP))
 endif
-CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP)
+CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP) 
 CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE) $(MONOWEB_DEP_FILE)
 endif
 
@@ -76,7 +76,6 @@ RESOURCE_FILES_2 = \
 OTHER_RES = $(RESOURCE_FILES_1)
 TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax \
-       Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \
@@ -84,6 +83,16 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap \
        Test/mainsoft/NunitWebResources/menuclass.aspx \
        Test/mainsoft/NunitWebResources/FormView.aspx \
        Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
@@ -169,7 +178,17 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/NoBindForMethodsWithBindInName.aspx \
        Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx \
        Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx \
-       Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx
+       Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx \
+       Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx \
+       Test/mainsoft/NunitWebResources/PreprocessorDirectivesInMarkup.aspx \
+       Test/mainsoft/NunitWebResources/UnquotedAngleBrackets.aspx \
+       Test/mainsoft/NunitWebResources/FullTagsInText.aspx \
+       Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx \
+       Test/mainsoft/NunitWebResources/NewlineInCodeExpression.aspx \
+       Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx \
+       Test/mainsoft/NunitWebResources/TagsNestedInClientTag.aspx \
+       Test/mainsoft/NunitWebResources/ConditionalClientComments.aspx \
+       Test/mainsoft/NunitWebResources/OneLetterIdentifierInCodeRender.aspx
 
 RESX_DIST =  resources/TranslationResources.resx
 ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
@@ -214,7 +233,7 @@ echo-warning-systemcore:
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%)
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll
 ifeq (net_2_0, $(PROFILE))
 TEST_MCS_FLAGS += -r:System.Web.Extensions.dll
 endif
@@ -227,17 +246,17 @@ include ../../build/library.make
 
 ifdef WEBSERVICES_DEP_FILE
 LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
-$(the_lib): $(WEBSERVICES_DEP_FILE)
+$(build_lib): $(WEBSERVICES_DEP_FILE)
 endif
 
 ifdef MONOWEB_DEP_FILE
 LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP)
-$(the_lib): $(MONOWEB_DEP_FILE)
+$(build_lib): $(MONOWEB_DEP_FILE)
 endif
 
 ifdef SYSTEMCORE_DEP_FILE
 LIB_MCS_FLAGS += -define:SYSTEMCORE_DEP -r:$(SYSTEMCORE_DEP)
-$(the_lib): $(SYSTEMCORE_DEP_FILE)
+$(build_lib): $(SYSTEMCORE_DEP_FILE)
 endif
 
 ifdef DEBUG
@@ -256,7 +275,7 @@ ifdef DEVEL
 LIB_MCS_FLAGS += -define:DEVEL
 endif
 
-$(the_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
+$(build_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
 
 $(RESX_RES): %.resources: %.resx
        $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`