X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FMakefile;h=2b1c0a572ca0cff38e84f0bfc62bf52925adc178;hb=4564cfa88c310accb8eeeed90dcb42e283c15fba;hp=1c368e640e19bcb958f013422068119936201f43;hpb=434e59e4bc6cda7d62ad6725a8b5a590ff9c9d1f;p=mono.git

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 1c368e640e1..2b1c0a572ca 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -57,10 +57,8 @@ RESOURCE_FILES_2 = \
 	resources/TreeView_tminus.gif \
 	resources/TreeView_tplus.gif \
 	resources/transparent.gif \
-	resources/callback.js \
 	resources/webform.js \
 	resources/WebUIValidation_2.0.js \
-	resources/MaintainScrollPositionOnPostBack.js \
 	System.Web.UI.WebControls/GridView.js \
 	System.Web.UI.WebControls/DetailsView.js \
 	System.Web.UI.WebControls/TreeView.js \
@@ -81,6 +79,8 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
 	Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx \
 	Test/mainsoft/NunitWebResources/PageWithTheme.aspx \
+	Test/mainsoft/NunitWebResources/ResolveUrl.ascx \
+	Test/mainsoft/NunitWebResources/ResolveUrl.aspx \
 	Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx \
 	Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx \
 	Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx \
@@ -92,6 +92,7 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/Web.sitemap \
 	Test/mainsoft/NunitWebResources/WizardTest.skin \
 	Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx \
+	Test/mainsoft/NunitWebResources/DataGrid.aspx \
 	Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx \
 	Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx \
 	Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx \
@@ -155,7 +156,7 @@ LIB_MCS_FLAGS = \
 ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
 NO_SIGN_ASSEMBLY = yes
 NO_INSTALL = yes
-all-local: echo-warning
+all-local: System.Web/UplevelHelper.cs echo-warning
 .PHONY: echo-warning
 
 ifeq   (, $(strip $(CYCLIC_DEP_FILES)))
@@ -166,7 +167,8 @@ endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219 -nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%)
 
-EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) $(TEST_RESOURCE_FILES)
+EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) $(TEST_RESOURCE_FILES) UplevelHelperDefinitions.xml
+BUILT_SOURCES = System.Web/UplevelHelper.cs
 
 include ../../build/library.make
 
@@ -175,6 +177,9 @@ LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(the_lib): $(WEBSERVICES_DEP_FILE)
 endif
 
+System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml
+	$(TEST_RUNTIME) $(topdir)/class/lib/net_1_1_bootstrap/culevel.exe -o $@ $^
+
 run-aaa: test
 	$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
 	/output:TestResult-$(PROFILE).log /include:aaa /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \