Visual studio upgrade did not work well.

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

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 93f0d6095100f82909d262e2b96c2080761e47b5..a3445db27f5a3caf089bb1fb1c4a7f855aecc735 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -14,14 +14,19 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 WEBSERVICES_DEP := System.Web.Services.dll
 WEBSERVICES_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(WEBSERVICES_DEP))
-CYCLIC_DEPS := $(WEBSERVICES_DEP)
-CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE)
+MONOWEB_DEP := Mono.Web.dll
+MONOWEB_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(MONOWEB_DEP))
+CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP)
+CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE) $(MONOWEB_DEP_FILE)
 endif
 
 RESOURCE_FILES_1= \
        resources/WebUIValidation.js
 
 RESOURCE_FILES_2 = \
+       resources/folder.gif \
+       resources/file.gif \
+       resources/computer.gif \
        resources/arrow_minus.gif \
        resources/arrow_noexpand.gif \
        resources/arrow_plus.gif \
@@ -59,6 +64,7 @@ RESOURCE_FILES_2 = \
        resources/transparent.gif \
        resources/webform.js \
        resources/WebUIValidation_2.0.js \
+       System.Web.Configuration_2.0/RandomRoboBotKeywords.txt \
        System.Web.UI.WebControls/GridView.js \
        System.Web.UI.WebControls/DetailsView.js \
        System.Web.UI.WebControls/TreeView.js \
@@ -133,6 +139,10 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/NoEventValidation.aspx \
        Test/mainsoft/NunitWebResources/ListControlPage.aspx \
        Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx \
+       Test/mainsoft/NunitWebResources/ClearErrorOnError.aspx \
+       Test/mainsoft/NunitWebResources/RedirectOnError.aspx \
+       Test/mainsoft/NunitWebResources/TestCapability.browser \
+       Test/mainsoft/NunitWebResources/PageWithAdapter.aspx \
        Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
 
 RESX_DIST =  resources/TranslationResources.resx
@@ -184,6 +194,11 @@ LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(the_lib): $(WEBSERVICES_DEP_FILE)
 endif
 
+ifdef MONOWEB_DEP_FILE
+LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP)
+$(the_lib): $(MONOWEB_DEP_FILE)
+endif
+
 $(the_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
 
 $(RESX_RES): %.resources: %.resx