X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=512cfb4f03acc67d6f131227e3a2f8b1711a3da7;hb=c3dd4e81836339a10dd08cf4d021f0278074ce93;hp=affdf485983da7afb6d46e4135c5e2d2a3aedf74;hpb=9869ae24b88761ab261c4311e24f7383b4af3f02;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index affdf485983..512cfb4f03a 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,8 +1,5 @@
 thisdir = class
 
-MONO_POSIX := Mono.Posix
-MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
-
 bootstrap_dirs := \
 	corlib					\
 	System					\
@@ -11,7 +8,7 @@ bootstrap_dirs := \
 	System.Security				\
 	System.Configuration			\
 	System					\
-	$(MONO_SYMBOLWRITER)
+	Mono.CompilerServices.SymbolWriter
 
 # Note that Mono.Security and System.Security aren't listed.
 # We may have to add those if 'mcs' starts using them.
@@ -38,32 +35,36 @@ common_dirs := \
 	System.Security			\
 	System.Configuration		\
 	System				\
+	System.XML			\
 	I18N				\
 	System.Drawing			\
+	System.Transactions		\
 	System.EnterpriseServices	\
 	Mono.C5				\
 	Mono.Data.Tds			\
-	System.Transactions		\
 	System.Data			\
 	Mono.Data			\
 	Mono.GetOptions			\
+	Mono.CompilerServices.SymbolWriter \
+	Mono.Posix			\
+	Accessibility			\
+	Mono.WebBrowser			\
+	Managed.Windows.Forms		\
+	Mono.Data.Sqlite		\
+	Mono.Data.SqliteClient		\
 	System.Web			\
+	Mono.Web			\
 	System.Web.Services		\
 	System.Web			\
 	System.Runtime.Serialization.Formatters.Soap \
 	System.Runtime.Remoting		\
 	System.Configuration.Install 	\
 	System.Management		\
-	$(MONO_SYMBOLWRITER)		\
-	$(MONO_POSIX)			\
-	Mono.Data.SqliteClient		\
 	Mono.Data.SybaseClient		\
 	Mono.Data.TdsClient		\
 	System.Data.OracleClient	\
-	Accessibility			\
 	Microsoft.VisualC		\
 	Cscompmgd			\
-	Managed.Windows.Forms		\
 	System.Design			\
 	PEAPI				\
 	Npgsql				\
@@ -78,43 +79,66 @@ common_dirs := \
 	System.Messaging	        \
 	System.ServiceProcess           \
 	System.Drawing.Design		\
+	System.Design			\
 	Mono.Http			\
 	Microsoft.Vsa			\
 	Mono.Cairo                      \
 	IBM.Data.DB2			\
 	Microsoft.JScript		\
-	CustomMarshalers
+	CustomMarshalers		\
+	OpenSystem.C
 
-default_dirs := FirebirdSql.Data.Firebird
+default_dirs :=		\
+	FirebirdSql.Data.Firebird	\
+	Mono.Cecil			\
+	Mono.Cecil.Mdb		\
 
 net_2_0_dirs := \
 	Microsoft.Build.Framework	\
 	Microsoft.Build.Utilities	\
 	Microsoft.Build.Engine		\
-	Microsoft.Build.Tasks
+	Microsoft.Build.Tasks		\
+	System.Core			\
+	System.Web.Extensions		\
+	System.Web.Extensions.Design	\
+	System.Xml.Linq			\
+	System.Data.DataSetExtensions	\
+	System.Data.Linq
+
+net_2_1_dirs := \
+	corlib			\
+	System			\
+	System.Net		\
+	System.XML		\
+	System.Core
+
+net_3_5_dirs := \
+	System.Web.Extensions		\
+	System.Web.Extensions.Design
 
 default_SUBDIRS := $(common_dirs) $(default_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
+net_2_1_bootstrap_SUBDIRS := $(net_2_1_dirs)
+net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
+net_3_5_SUBDIRS := $(net_3_5_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs)
+SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
-# I wrote makefiles for them.
-
-BROKEN_SUBDIRS =
-
-DIST_ONLY_SUBDIRS = \
-	$(BROKEN_SUBDIRS)
+#BROKEN_SUBDIRS =
+#DIST_ONLY_SUBDIRS = $(BROKEN_SUBDIRS)
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
 
 DISTFILES = \
 	ecma.pub		\
+	winfx.pub		\
 	mono.pub		\
 	msfinal.pub		\
+	silverlight.pub		\
 	mono.snk		\
 	LICENSE 		\
 	README			\
@@ -122,6 +146,7 @@ DISTFILES = \
 	doc/NUnitGuidelines	\
 	doc/TemplateTest.cs	\
 	notes/BitVecto32.txt	\
+	MicrosoftAjaxLibrary/License.htm	\
 	$(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
@@ -131,13 +156,11 @@ all-local $(STD_TARGETS:=-local):
 basic_files = mcs.exe mscorlib.dll System.dll System.Xml.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
-DIST_PROFILE_DIRS = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
-COMPAT_PROFILE_DIRS = default net_2_0
-
 lib/monolite:
 	$(MKINSTALLDIRS) $@
 
-$(monolite_files): lib/monolite/%: lib/basic/% lib/monolite
+$(monolite_files): | lib/monolite
+$(monolite_files): lib/monolite/%: lib/basic/%
 	cp -p $< $@
 
 $(basic_files:%=lib/basic/%):
@@ -145,4 +168,3 @@ $(basic_files:%=lib/basic/%):
 
 dist-default: $(monolite_files)
 dist-local: dist-default
-	-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%) $(COMPAT_PROFILE_DIRS:%=$(distdir)/compat/%)