adapt olive Makefiles to mcs

svn path=/trunk/mcs/; revision=111193

mcs/class/System.IdentityModel.Selectors/Makefile

@@ -4,18 +4,18 @@ include ../../build/rules.make
 
 LIBRARY = System.IdentityModel.Selectors.dll
 LIB_MCS_FLAGS = \
+		/d:NET_3_0	\
 		/r:System.dll \
 		/r:System.Xml.dll \
 		/r:System.Security.dll \
-		/r:../lib/net_3_0/System.Runtime.Serialization.dll \
-		/r:../lib/net_3_0/System.IdentityModel.dll
+		/r:System.Runtime.Serialization.dll \
+		/r:System.IdentityModel.dll
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-# This is a WinFX only assembly
-VALID_PROFILE := $(filter net_3_0 net_3_5, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.IdentityModel.Selectors.dll
 NO_INSTALL = yes

mcs/class/System.IdentityModel/Makefile

@@ -4,12 +4,13 @@ include ../../build/rules.make
 
 LIBRARY = System.IdentityModel.dll
 LIB_MCS_FLAGS = \
+			/d:NET_3_0	\
 	        /r:System.dll \
 	        /r:System.Xml.dll \
 	        /r:System.Security.dll \
 		/r:System.Web.dll \
 		/r:Mono.Security.dll \
-	        /r:../lib/net_3_0/System.Runtime.Serialization.dll
+	        /r:System.Runtime.Serialization.dll
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
@@ -18,8 +19,7 @@ EXTRA_DISTFILES = \
 	Test/Resources/test.pfx \
 	Test/Resources/test2.pfx
 
-# This is a WinFX only assembly
-VALID_PROFILE := $(filter net_3_0 net_3_5, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.IdentityModel.dll
 NO_INSTALL = yes

mcs/class/System.Runtime.Serialization/Makefile

@@ -7,6 +7,7 @@ RESOURCE_FILES = \
 
 LIBRARY = System.Runtime.Serialization.dll
 LIB_MCS_FLAGS = \
+			/d:NET_3_0	\
 			/nowarn:168,169,219,414 \
 	        /r:System.dll \
 	        /r:System.Xml.dll \
@@ -20,8 +21,7 @@ EXTRA_DISTFILES = $(RESOURCE_FILES) \
 	Test/Resources/FrameworkTypes/* \
 	Test/System.Runtime.Serialization/one.xml
 
-# This assembly is .NET 3.0 or later only
-VALID_PROFILE := $(filter net_3_0 net_3_5, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Runtime.Serialization.dll
 NO_INSTALL = yes

mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs

@@ -54,4 +54,4 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../winfx3.pub")]
+[assembly: AssemblyKeyFile("../winfx.pub")]

mcs/class/System.ServiceModel.Web/Makefile

@@ -3,14 +3,13 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.ServiceModel.Web.dll
-LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:../lib/net_3_0/System.Runtime.Serialization.dll -r:../lib/net_3_0/System.ServiceModel.dll
+LIB_MCS_FLAGS = -d:NET_3_0 -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-# This is a Orcas only assembly
-VALID_PROFILE := $(filter net_3_5, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.Web.dll
 NO_INSTALL = yes
@@ -18,7 +17,7 @@ NO_SIGN_ASSEMBLY = yes
 endif
 
 test-data-ondotnet:
-	csc -out:SyndicationSerializerUtil.exe -r:../lib/net_3_5/System.ServiceModel.Web.dll $(LIB_MCS_FLAGS) Test\\System.ServiceModel.Syndication\\SyndicationSerializerUtil.cs Test\\System.ServiceModel.Syndication\\FeedLib.cs
+	csc -out:SyndicationSerializerUtil.exe -r:System.ServiceModel.Web.dll $(LIB_MCS_FLAGS) Test\\System.ServiceModel.Syndication\\SyndicationSerializerUtil.cs Test\\System.ServiceModel.Syndication\\FeedLib.cs
 	./SyndicationSerializerUtil.exe
 
 test-data:

mcs/class/System.ServiceModel/Makefile

@@ -8,15 +8,16 @@ RESOURCE_FILES = \
 
 LIBRARY = System.ServiceModel.dll
 LIB_MCS_FLAGS = \
+		/d:NET_3_0	\
 		/nowarn:414,169,67,3005,436,219,618 \
 		/unsafe \
 	        /r:System.dll \
 	        /r:System.Xml.dll \
 	        /r:System.Configuration.dll \
-	        /r:../lib/net_3_0/System.Runtime.Serialization.dll \
+	        /r:System.Runtime.Serialization.dll \
 	        /r:System.Security.dll \
-	        /r:../lib/net_3_0/System.IdentityModel.dll \
-		/r:../lib/net_3_0/System.IdentityModel.Selectors.dll \
+	        /r:System.IdentityModel.dll \
+		/r:System.IdentityModel.Selectors.dll \
 	        /r:System.Transactions.dll \
 		/r:System.Messaging.dll \
 	        /r:System.Web.dll \
@@ -34,12 +35,10 @@ TEST_EXTRA_FILES = \
 
 EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_EXTRA_FILES)
 
-# This is a WinFX only assembly
-
 # Useful for debugging under Visual Studio 2005
 # NO_SIGN_ASSEMBLY = yes
 
-VALID_PROFILE := $(filter net_3_0 net_3_5, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.dll
 NO_INSTALL = yes