X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=c5f600df757db3b19f3a2cb2cf05d37dbb097ec9;hb=496b8e22e111d25b97c55c1db70ef228ea3cc0aa;hp=44b62436677f8fcce6830c6f0efafda84dc776e2;hpb=323e3af9ac7fa6f02f27e1debf15df4a8a81754d;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 44b62436677..c5f600df757 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -4,12 +4,12 @@ MONO_POSIX := Mono.Posix
 MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
 
 bootstrap_dirs := \
-	corlib 					\
+	corlib					\
 	System					\
 	System.XML				\
 	Mono.Security				\
 	System.Security				\
-	System.Configuration		\
+	System.Configuration			\
 	System					\
 	$(MONO_SYMBOLWRITER)
 
@@ -18,40 +18,46 @@ bootstrap_dirs := \
 basic_SUBDIRS := corlib System System.XML System
 
 net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
-net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
-
-include ../build/rules.make
-
-# For now, Mono.Security.Win32 is built on Linux too.
-# However, it isn't tested on Linux, since it depends on a Win32 dll.
-SUBDIRS = \
+net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
+
+net_1_1_java_SUBDIRS = \
+	System.Xml					\
+	System.Data					\
+	System.Drawing					\
+	Novell.Directory.Ldap				\
+	System.DirectoryServices			\
+	System.Runtime.Serialization.Formatters.Soap	\
+	System.Runtime.Remoting
+
+common_dirs := \
 	corlib				\
 	System				\
 	System.XML			\
 	Mono.Security			\
-	System.Configuration	\
 	System				\
 	System.Security			\
+	System.Configuration		\
+	System				\
 	I18N				\
 	System.Drawing			\
 	System.EnterpriseServices	\
-	Mono.C5				\
 	Mono.Data.Tds			\
 	System.Data			\
 	Mono.Data			\
 	Mono.GetOptions			\
 	System.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	\
-	$(MONO_POSIX)			\
 	Accessibility			\
 	Microsoft.VisualC		\
 	Cscompmgd			\
@@ -61,6 +67,7 @@ SUBDIRS = \
 	PEAPI				\
 	Npgsql				\
 	ICSharpCode.SharpZipLib		\
+	Compat.ICSharpCode.SharpZipLib	\
 	ByteFX.Data			\
 	Commons.Xml.Relaxng		\
 	Novell.Directory.Ldap		\
@@ -73,21 +80,33 @@ SUBDIRS = \
 	Microsoft.Vsa			\
 	Mono.Cairo                      \
 	IBM.Data.DB2			\
-	Microsoft.JScript		\
-	FirebirdSql.Data.Firebird
+	Microsoft.JScript
 
-# Starting with Microsoft.Vsa, the libraries above weren't in the
-# Linux makefile.gnu before, but they build fine, so might as well
-# include them ...
-#
+default_dirs := FirebirdSql.Data.Firebird
+
+net_2_0_dirs := \
+	Microsoft.Build.Framework	\
+	Microsoft.Build.Utilities	\
+	Microsoft.Build.Engine		\
+	Microsoft.Build.Tasks
+
+default_SUBDIRS := $(common_dirs) $(default_dirs)
+net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
+
+include ../build/rules.make
+
+SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
 # I wrote makefiles for them.
 
-DIST_ONLY_SUBDIRS = \
+BROKEN_SUBDIRS = \
 	Custommarshalers		\
 	Mono.Globalization
 
+DIST_ONLY_SUBDIRS = \
+	$(BROKEN_SUBDIRS)
+
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
 
@@ -112,6 +131,7 @@ 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) $@
@@ -124,4 +144,4 @@ $(basic_files:%=lib/basic/%):
 
 dist-default: $(monolite_files)
 dist-local: dist-default
-	-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%)
+	-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%) $(COMPAT_PROFILE_DIRS:%=$(distdir)/compat/%)