[bcl] Remove some net 1.0 stuff from Makefiles.

diff --git a/mcs/class/Mono.Messaging/Makefile b/mcs/class/Mono.Messaging/Makefile
index a3c654c59197d1c923883e7e9317cbe677d91ee7..17342765febb13834bf65cfaa6d64f34ce95235d 100644 (file)
--- a/mcs/class/Mono.Messaging/Makefile
+++ b/mcs/class/Mono.Messaging/Makefile
@@ -4,11 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = Mono.Messaging.dll
 
-ifeq (1, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS = /r:System.dll
-else
 LIB_MCS_FLAGS = /r:System.dll /r:System.Configuration
-endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 /r:System.Messaging.dll /r:nunit.mocks.dll
 

diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 2d02f95861519cbb0e1ff4b472211dffbcbea6b6..388e13216c8715d72c1300d04edabecaef5caec1 100644 (file)
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -28,14 +28,12 @@ LOCAL_MCS_FLAGS = -lib:$(plainweb_dir)
 plainweb = $(plainweb_dir)/System.Web.dll
 system_web_services_deps = $(plainweb)
 
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += \
        -r:System.Configuration.dll \
        -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd \
        -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \
        -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd
 endif
-endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618
 
@@ -53,4 +51,4 @@ $(the_libdir_base)$(LIBRARY): $(system_web_services_deps)
 $(plainweb):
        (cd ../System.Web; $(MAKE) $@)
 
-.NOTPARALLEL: $(plainweb)
\ No newline at end of file
+.NOTPARALLEL: $(plainweb)

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 96933615aece403375317cc339a61039ca613d28..76108716e36452dfe0014b9ab83ae0f892aae643 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -226,18 +226,14 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx
 
 RESX_DIST =  resources/TranslationResources.resx
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 RESX_RES = $(RESX_DIST:.resx=.resources)
-endif
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 NUNIT_APP_CODE_FILES = $(TEST_APP_CODE_FILES)
 NUNIT_APP_GLOBALRESOURCES_FILES = $(TEST_APP_GLOBALRESOURCES_FILES)
 
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_RES += $(RESOURCE_FILES_2)
 OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:618 -r:System.Configuration.dll -r:Mono.Data.Sqlite.dll
-endif
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll