Merge pull request #2397 from alexanderkyte/debugger_appdomain

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

diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile
index bef0ff6e755c4e37d3252d5c1625d0c46abcac5c..bf15f32944f8a2e700ca4acc1066ddedf799497e 100644 (file)
--- a/mcs/class/System.Web.Extensions/Makefile
+++ b/mcs/class/System.Web.Extensions/Makefile
@@ -30,9 +30,7 @@ RESOURCE_FILES_DIST= \
 
 NUNIT_RESOURCE_FILES= \
        Test/resources/Web.mono.config \
-       Test/resources/profile.config.4.5 \
-       Test/resources/profile.config.4.0 \
-       Test/resources/profile.config.2.0 \
+       Test/resources/profile.config.4.x \
        $(wildcard Test/resources/*.as?x) \
        $(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.cs) \
        $(wildcard ../System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/*.as?x) \
@@ -55,33 +53,27 @@ ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
 endif
 
+LIB_REFS = System System.Core System.Drawing System.Data System.Data.Linq System.Xml System.Web System.Web.Services System.Configuration System.EnterpriseServices System.ServiceModel
 LIB_MCS_FLAGS = \
        -unsafe \
        -define:NET_3_5                 \
        -define:SYSTEM_WEB_EXTENSIONS   \
        -r:$(corlib)                    \
-       -r:System.dll                   \
-       -r:System.Core.dll              \
-       -r:System.Drawing.dll           \
-       -r:System.Data.dll              \
-       -r:System.Data.Linq.dll         \
-       -r:System.Xml.dll               \
-       -r:System.Web.dll               \
-       -r:System.Web.Services.dll      \
-       -r:System.Configuration.dll     \
-       -r:System.EnterpriseServices.dll \
-       -r:System.ServiceModel.dll      \
        $(OTHER_LIB_MCS_FLAGS)          \
        $(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 -define:SYSTEM_WEB_EXTENSIONS
 
 EXTRA_DISTFILES = $(RESOURCE_FILES_DIST) $(NUNIT_RESOURCE_FILES) \
-       System.Web.Extensions_standalone_test.dll.sources
+       System.Web.Extensions_standalone_test.dll.sources \
+       Test/standalone-tests/Consts.cs.in \
+       Test/standalone-tests/DataPager_NumericPagerField_Bug615315.cs
 
-run-standalone-test: $(STANDALONE_TEST_MAKEFRAG) $(STANDALONE_RUNNER_SUPPORT_MAKEFRAG) $(STANDALONE_TEST_ASSEMBLY)
+build-standalone-runner-support:
        $(MAKE) -C ../System.Web/ standalone-runner-support
        $(MAKE) -C ../System.Web/Test/tools/ STANDALONE_SUPPORT_BUILT=1 standalone-runner.exe
+
+run-standalone-test: build-standalone-runner-support $(STANDALONE_RUNNER_SUPPORT_MAKEFRAG) $(STANDALONE_TEST_MAKEFRAG) $(STANDALONE_TEST_ASSEMBLY)
        $(RUN_STANDALONE) $(STANDALONE_TEST_ASSEMBLY)
 
 $(STANDALONE_TEST_MAKEFRAG): System.Web.Extensions_standalone_test.dll.sources