X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=2b2ff3763d1b7f7e5afae43ed09fcf31c8570ea6;hb=dfa003f2fc0862c03abb06f5ff1a33dd6ca297ff;hp=1a83c17da5262c0c946d8ff8fd9b3654258713d4;hpb=4323fbeaebf249f016dfdd6dc9b3b52a515f87c4;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1a83c17da52..2b2ff3763d1 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -2,20 +2,18 @@ thisdir = class
 
 bootstrap_dirs := \
 	corlib					\
+	Mono.CompilerServices.SymbolWriter	\
 	System					\
 	System.XML				\
 	Mono.Security				\
 	System.Security				\
 	System.Configuration			\
-	System					\
-	Mono.CompilerServices.SymbolWriter
+	System
+
 
 # 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
-
-net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
-net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
+basic_SUBDIRS := corlib System System.XML System Mono.Security Mono.CompilerServices.SymbolWriter System.Core
 
 net_1_1_java_SUBDIRS = \
 	System.Xml					\
@@ -30,6 +28,9 @@ common_dirs := \
 	corlib				\
 	System				\
 	System.XML			\
+	Mono.CompilerServices.SymbolWriter \
+	Mono.Posix			\
+	System.Core			\
 	Mono.Security			\
 	System				\
 	System.Security			\
@@ -40,13 +41,10 @@ common_dirs := \
 	System.Drawing			\
 	System.Transactions		\
 	System.EnterpriseServices	\
-	Mono.C5				\
 	Mono.Data.Tds			\
 	System.Data			\
 	Mono.Data			\
 	Mono.GetOptions			\
-	Mono.CompilerServices.SymbolWriter \
-	Mono.Posix			\
 	Accessibility			\
 	Mono.WebBrowser			\
 	Managed.Windows.Forms		\
@@ -76,7 +74,10 @@ common_dirs := \
 	Novell.Directory.Ldap		\
 	Mono.Security.Win32		\
 	System.DirectoryServices	\
+	RabbitMQ.Client			\
+	Mono.Messaging			\
 	System.Messaging	        \
+	Mono.Messaging.RabbitMQ		\
 	System.ServiceProcess           \
 	System.Drawing.Design		\
 	System.Design			\
@@ -86,57 +87,111 @@ common_dirs := \
 	IBM.Data.DB2			\
 	Microsoft.JScript		\
 	CustomMarshalers		\
-	OpenSystem.C
-
-default_dirs :=		\
-	FirebirdSql.Data.Firebird	\
+	OpenSystem.C			\
 	Mono.Cecil			\
-	Mono.Cecil.Mdb		\
+	Mono.Cecil.Mdb			\
+	Mono.Debugger.Soft		\
+	SystemWebTestShim
+
+net_1_1_dirs :=		\
+	FirebirdSql.Data.Firebird
 
 net_2_0_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
 	Microsoft.Build.Engine		\
 	Microsoft.Build.Tasks		\
-	System.Core			\
-	System.Web.Extensions		\
-	System.Web.Extensions.Design	\
 	System.Xml.Linq			\
+	System.Runtime.Serialization	\
 	System.Data.DataSetExtensions	\
 	System.Data.Linq		\
-	System.Runtime.Serialization	\
+	System.Web			\
+	System.Web.Abstractions		\
+	System.Web.Routing		\
 	System.IdentityModel		\
 	System.IdentityModel.Selectors	\
 	System.ServiceModel		\
-	System.ServiceModel.Web
+	System.Web.Extensions		\
+	System.Web.Extensions.Design	\
+	System.ComponentModel.DataAnnotations	\
+	System.Web.DynamicData		\
+	System.ServiceModel.Web		\
+	System.Web.Mvc			\
+	Mono.C5				\
+	Mono.Management			\
+	Mono.Options 			\
+	Mono.Simd			\
+	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 := \
 	corlib			\
+	Mono.CompilerServices.SymbolWriter \
+	System.Core		\
 	System			\
 	System.Net		\
 	System.XML		\
-	System.Core		\
+	System.Xml.Linq	\
 	System.Runtime.Serialization	\
 	System.ServiceModel	\
 	System.ServiceModel.Web
 
-net_3_5_dirs := \
-	System.Web.Extensions		\
-	System.Web.Extensions.Design
+monotouch_dirs := \
+	corlib	\
+	Mono.CompilerServices.SymbolWriter	\
+	System	\
+	System.XML	\
+	Mono.Security	\
+	System	\
+	I18N		\
+	System.Core	\
+	System.Json	\
+	System.Xml.Linq	\
+	System.Runtime.Serialization	\
+	System.ServiceModel	\
+	System.ServiceModel.Web	\
+	System.Web.Services	\
+	Mono.Data.Tds	\
+	System.Transactions	\
+	System.Data	\
+	Mono.Data.Sqlite
 
-default_SUBDIRS := $(common_dirs) $(default_dirs)
-net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
-net_2_1_bootstrap_SUBDIRS := corlib System
+net_3_5_dirs := \
+	Microsoft.Build.Framework	\
+	Microsoft.Build.Utilities	\
+	Microsoft.Build.Engine		\
+	Microsoft.Build.Tasks		\
+	System.Web.Extensions.Design	
+
+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 System.Core
 net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
+monotouch_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter
+monotouch_SUBDIRS := $(monotouch_dirs)
 net_3_5_SUBDIRS := $(net_3_5_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) $(default_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
+SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_2_1_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
@@ -144,6 +199,7 @@ SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3
 DISTFILES = \
 	ecma.pub		\
 	winfx.pub		\
+	winfx3.pub		\
 	mono.pub		\
 	msfinal.pub		\
 	silverlight.pub		\
@@ -161,7 +217,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:
@@ -176,3 +234,6 @@ $(basic_files:%=lib/basic/%):
 
 dist-default: $(monolite_files)
 dist-local: dist-default
+
+csproj-local:
+