X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=b3d367cb2e04d080cd5782ecc11b6e830a2a4343;hb=dc75a4a86e190c2728d1858bf399a9c7e1cc01dc;hp=a7aac9b8a17201e48ddc9443d26528ef8058844d;hpb=5ad1099341581dee94f77b32db728918e90fa64f;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index a7aac9b8a17..b3d367cb2e0 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -25,7 +25,7 @@ net_1_1_java_SUBDIRS = \
 	System.Runtime.Serialization.Formatters.Soap	\
 	System.Runtime.Remoting
 
-common_dirs := \
+net_2_0_dirs := \
 	corlib				\
 	System				\
 	System.XML			\
@@ -33,11 +33,8 @@ common_dirs := \
 	Mono.Posix			\
 	System.Core			\
 	Mono.Security			\
-	System				\
 	System.Security			\
 	System.Configuration		\
-	System				\
-	System.XML			\
 	I18N				\
 	$(resgen_dir)			\
 	System.Drawing			\
@@ -52,16 +49,13 @@ common_dirs := \
 	Mono.Data.Sqlite		\
 	System.Web.ApplicationServices	\
 	System.Web			\
-	Mono.Web			\
 	System.Web.Services		\
-	System.Web			\
 	System.Runtime.Remoting		\
 	System.Configuration.Install 	\
 	System.Management		\
 	System.Data.OracleClient	\
 	Microsoft.VisualC		\
 	Cscompmgd			\
-	System.Design			\
 	PEAPI				\
 	Npgsql				\
 	Commons.Xml.Relaxng		\
@@ -81,18 +75,14 @@ common_dirs := \
 	Mono.Cairo                      \
 	IBM.Data.DB2			\
 	CustomMarshalers		\
-	OpenSystem.C			\
 	Mono.Cecil			\
 	Mono.Cecil.Mdb			\
 	Mono.Debugger.Soft		\
-	SystemWebTestShim
-
-net_2_0_dirs := \
+	SystemWebTestShim			\
 	System.Xml.Linq			\
 	System.Runtime.Serialization	\
 	System.Data.DataSetExtensions	\
 	System.Data.Linq		\
-	System.Web			\
 	System.Web.Abstractions		\
 	System.Web.Routing		\
 	System.IdentityModel		\
@@ -110,15 +100,15 @@ net_2_0_dirs := \
 	Mono.Tasklets       		\
 	System.Dynamic			\
 	Mono.CSharp			\
-	System.Net				\
+	System.Net			\
 	System.Json
 
 net_2_0_only_dirs := \
 	System.Web.Extensions_1.0	\
-	System.Web.Extensions.Design_1.0	\
+	System.Web.Extensions.Design_1.0\
 	Compat.ICSharpCode.SharpZipLib	\
 	WindowsBase			\
-	System.ServiceModel.Web \
+	System.ServiceModel.Web 	\
 	System.Data.Services.Client	\
 	System.Data.Services		\
 	System.Web.Mvc \
@@ -168,13 +158,16 @@ xammac_dirs := \
 	System.Net.Http
 
 monotouch_runtime_dirs := \
-	corlib
+	corlib \
+	System \
+	System.Core \
+	System.XML \
+	Mono.CSharp
 
 monotouch_dirs := \
 	Mono.CSharp	\
 	Microsoft.CSharp \
-	Mono.Dynamic.Interpreter \
-	System.Core
+	Mono.Dynamic.Interpreter
 
 net_4_0_dirs := \
 	System.Numerics		\
@@ -183,7 +176,6 @@ net_4_0_dirs := \
 	System.Xaml \
 	WindowsBase \
 	System.ServiceModel.Activation \
-	System.ServiceModel \
 	System.ServiceModel.Routing \
 	System.ServiceModel.Discovery \
 	System.Runtime.Caching \
@@ -207,7 +199,7 @@ net_4_0_dirs := \
 	System.Data.Services \
 	System.Json.Microsoft \
 	monodoc
-	
+
 net_4_0_only_dirs := \
 	System.ComponentModel.Composition
 
@@ -245,7 +237,7 @@ xbuild_4_0_dirs := \
 	$(xbuild_2_0_dirs)	\
 	Microsoft.Build
 
-net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
+net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
 monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
 monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
@@ -253,13 +245,13 @@ mobile_static_SUBDIRS := $(mobile_dirs)
 mobile_SUBDIRS := $(mobile_dirs)
 xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs)
 net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
-net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
+net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
+net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
 
@@ -289,7 +281,7 @@ all-local $(STD_TARGETS:=-local):
 	@:
 
 # Files needed to bootstrap C# compiler
-basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
+basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
 lib/monolite: