X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=f0d4819cc64b233e1ed8bc1642fdae908ed756cb;hb=83a2cc75f87a21c00c6ea3e1c6cc20c0a4eeb153;hp=907c9e97c8bbbdcce8b04b7982d0e63d421289c4;hpb=347c9c88987dedff2ea7fc7fd93dbf7982f440cd;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 907c9e97c8b..f0d4819cc64 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
 
 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			\
@@ -43,7 +45,6 @@ common_dirs := \
 	System.Data			\
 	Mono.Data			\
 	Mono.GetOptions			\
-	Mono.Posix			\
 	Accessibility			\
 	Mono.WebBrowser			\
 	Managed.Windows.Forms		\
@@ -98,7 +99,6 @@ net_2_0_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
 	Microsoft.Build.Engine		\
-	System.Core			\
 	Microsoft.Build.Tasks		\
 	System.Xml.Linq			\
 	System.Runtime.Serialization	\
@@ -107,20 +107,21 @@ 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			\
 	Mono.C5				\
 	Mono.Management			\
 	Mono.Options 			\
 	Mono.Simd			\
-	Mono.Tasklets       
+	Mono.Tasklets       		\
+	WindowsBase
 
 net_2_0_only_dirs := \
 	System.Web.Extensions_1.0	\
@@ -138,6 +139,21 @@ net_2_1_dirs := \
 	System.ServiceModel	\
 	System.ServiceModel.Web
 
+monotouch_dirs := \
+	corlib	\
+	Mono.CompilerServices.SymbolWriter	\
+	System	\
+	System.XML	\
+	Mono.Security	\
+	System	\
+	System.Core	\
+	System.Json	\
+	System.Xml.Linq	\
+	System.Runtime.Serialization	\
+	System.ServiceModel	\
+	System.ServiceModel.Web	\
+	System.Web.Services 
+
 net_3_5_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
@@ -149,15 +165,13 @@ net_4_0_dirs := \
 	System.Dynamic		\
 	Microsoft.CSharp
 
-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_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)
-monotouch_SUBDIRS := $(net_2_1_dirs)
+monotouch_SUBDIRS := $(monotouch_dirs)
 net_3_5_SUBDIRS := $(net_3_5_dirs)
-net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
+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
@@ -174,6 +188,7 @@ SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(
 DISTFILES = \
 	ecma.pub		\
 	winfx.pub		\
+	winfx3.pub		\
 	mono.pub		\
 	msfinal.pub		\
 	silverlight.pub		\
@@ -191,7 +206,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
 monolite_files = $(basic_files:%=lib/monolite/%)
 
 lib/monolite: