X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=6684a19ee3580dabb5c18cd8421b79c29c43136c;hb=05a5b21fa0cec68f995fc648dcd52ff08f5c5d73;hp=e6e9be93a06c9fbc83fbe3eded38fe3f1a3d338b;hpb=6f1d5e5874abfbd70df5716a9ed0078022b37fc2;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index e6e9be93a06..6684a19ee35 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -13,7 +13,7 @@ bootstrap_dirs := \
 
 # Note that Mono.Security and System.Security aren't listed.
 # We may have to add those if 'mcs' starts using them.
-basic_SUBDIRS := corlib System System.XML System
+basic_SUBDIRS := corlib System System.XML System Mono.Security Mono.CompilerServices.SymbolWriter System.Core
 
 net_1_1_java_SUBDIRS = \
 	System.Xml					\
@@ -29,6 +29,8 @@ common_dirs := \
 	System				\
 	System.XML			\
 	Mono.CompilerServices.SymbolWriter \
+	Mono.Posix			\
+	System.Core			\
 	Mono.Security			\
 	System				\
 	System.Security			\
@@ -39,17 +41,12 @@ common_dirs := \
 	System.Drawing			\
 	System.Transactions		\
 	System.EnterpriseServices	\
-	Mono.C5				\
 	Mono.Data.Tds			\
 	System.Data			\
-	Mono.Data			\
-	Mono.GetOptions			\
-	Mono.Posix			\
 	Accessibility			\
 	Mono.WebBrowser			\
 	Managed.Windows.Forms		\
 	Mono.Data.Sqlite		\
-	Mono.Data.SqliteClient		\
 	System.Web			\
 	Mono.Web			\
 	System.Web.Services		\
@@ -58,8 +55,6 @@ common_dirs := \
 	System.Runtime.Remoting		\
 	System.Configuration.Install 	\
 	System.Management		\
-	Mono.Data.SybaseClient		\
-	Mono.Data.TdsClient		\
 	System.Data.OracleClient	\
 	Microsoft.VisualC		\
 	Cscompmgd			\
@@ -69,7 +64,6 @@ common_dirs := \
 	Compat.ICSharpCode.SharpZipLib	\
 	ICSharpCode.SharpZipLib		\
 	Compat.ICSharpCode.SharpZipLib	\
-	ByteFX.Data			\
 	Commons.Xml.Relaxng		\
 	Novell.Directory.Ldap		\
 	Mono.Security.Win32		\
@@ -82,24 +76,20 @@ common_dirs := \
 	System.Drawing.Design		\
 	System.Design			\
 	Mono.Http			\
-	Microsoft.Vsa			\
 	Mono.Cairo                      \
 	IBM.Data.DB2			\
-	Microsoft.JScript		\
 	CustomMarshalers		\
-	OpenSystem.C
-
-net_1_1_dirs :=		\
-	FirebirdSql.Data.Firebird	\
+	OpenSystem.C			\
 	Mono.Cecil			\
-	Mono.Cecil.Mdb		\
+	Mono.Cecil.Mdb			\
+	Mono.Debugger.Soft		\
+	SystemWebTestShim
 
 net_2_0_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
 	Microsoft.Build.Engine		\
 	Microsoft.Build.Tasks		\
-	System.Core			\
 	System.Xml.Linq			\
 	System.Runtime.Serialization	\
 	System.Data.DataSetExtensions	\
@@ -107,36 +97,62 @@ net_2_0_dirs := \
 	System.Web			\
 	System.Web.Abstractions		\
 	System.Web.Routing		\
+	System.IdentityModel		\
+	System.IdentityModel.Selectors	\
+	System.ServiceModel		\
 	System.Web.Extensions		\
 	System.Web.Extensions.Design	\
 	System.ComponentModel.DataAnnotations	\
 	System.Web.DynamicData		\
-	System.IdentityModel		\
-	System.IdentityModel.Selectors	\
-	System.ServiceModel		\
 	System.ServiceModel.Web		\
 	System.Web.Mvc			\
+	System.Web.Mvc2			\
+	Mono.C5				\
 	Mono.Management			\
 	Mono.Options 			\
 	Mono.Simd			\
-	Mono.Tasklets
-	
+	Mono.Tasklets       		\
+	Mono.CSharp			\
+	WindowsBase			\
+	System.Data.Services
+
 net_2_0_only_dirs := \
 	System.Web.Extensions_1.0	\
 	System.Web.Extensions.Design_1.0
 
-net_2_1_dirs := \
+moonlight_dirs := \
 	corlib			\
 	Mono.CompilerServices.SymbolWriter \
+	System.Core		\
 	System			\
-	System.Net		\
 	System.XML		\
-	System.Core		\
+	System.Net		\
 	System.Xml.Linq	\
 	System.Runtime.Serialization	\
 	System.ServiceModel	\
 	System.ServiceModel.Web
 
+monotouch_dirs := \
+	corlib	\
+	Mono.CompilerServices.SymbolWriter	\
+	System.Core	\
+	System	\
+	System.XML	\
+	Mono.Security	\
+	System	\
+	I18N		\
+	System.Xml.Linq	\
+	System.Runtime.Serialization	\
+	System.ServiceModel	\
+	System.ServiceModel.Web	\
+	System.Json	\
+	System.Web.Services	\
+	Mono.Data.Tds	\
+	System.Transactions	\
+	System.Data	\
+	Mono.Cairo	\
+	Mono.Data.Sqlite
+
 net_3_5_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
@@ -144,23 +160,29 @@ net_3_5_dirs := \
 	Microsoft.Build.Tasks		\
 	System.Web.Extensions.Design	
 
-net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
-net_1_1_SUBDIRS := $(common_dirs) $(net_1_1_dirs)
-net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
+net_4_0_dirs := \
+	System.Dynamic		\
+	System.Numerics		\
+	Microsoft.CSharp	\
+	System.Windows.Forms.DataVisualization	\
+	System.ComponentModel.Composition \
+	System.ServiceModel.Routing
+
+net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs)
-net_2_1_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter
-net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
+moonlight_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
+moonlight_raw_SUBDIRS := $(moonlight_dirs)
+monotouch_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
+monotouch_SUBDIRS := $(monotouch_dirs)
 net_3_5_SUBDIRS := $(net_3_5_dirs)
-net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
+net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) Mono.Posix System.Core
+net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
+SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(monotouch_dirs) $(net_3_5_dirs) $(net_4_0_dirs)
 
-# These libraries below are either unimplemented or don't compile, but
-#BROKEN_SUBDIRS =
-#DIST_ONLY_SUBDIRS = $(BROKEN_SUBDIRS)
+DIST_ONLY_SUBDIRS = dlr
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -168,6 +190,7 @@ SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3
 DISTFILES = \
 	ecma.pub		\
 	winfx.pub		\
+	winfx3.pub		\
 	mono.pub		\
 	msfinal.pub		\
 	silverlight.pub		\
@@ -185,7 +208,9 @@ DISTFILES = \
 all-local $(STD_TARGETS:=-local):
 	@:
 
-basic_files = mcs.exe mscorlib.dll System.dll System.Xml.dll
+# What is this used for ?
+
+basic_files = gmcs.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
 lib/monolite: