X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=07735b0cdf958793b635db7de0d410bc8938be6c;hb=db09f4bbd604536b60003befc1dc02f5a2b55549;hp=8ca0b07bdf6be20d4204a1b2ce9bb7d8395bfd1c;hpb=143451ff330dabafaada9d0c0a695065766d91b0;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 8ca0b07bdf6..07735b0cdf9 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -4,47 +4,61 @@ MONO_POSIX := Mono.Posix
 MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
 
 bootstrap_dirs := \
-	corlib 					\
+	corlib					\
 	System					\
 	System.XML				\
+	Mono.Security				\
+	System.Security				\
+	System.Configuration			\
 	System					\
 	$(MONO_SYMBOLWRITER)
 
+# 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) Mono.Security
-net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 
-include ../build/rules.make
+net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
+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
 
-# 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 = \
+common_dirs := \
 	corlib				\
 	System				\
 	System.XML			\
+	Mono.Security			\
+	System				\
+	System.Security			\
+	System.Configuration		\
 	System				\
 	I18N				\
 	System.Drawing			\
 	System.EnterpriseServices	\
 	Mono.C5				\
-	Mono.Security			\
 	Mono.Data.Tds			\
-	System.Security			\
 	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			\
@@ -54,6 +68,7 @@ SUBDIRS = \
 	PEAPI				\
 	Npgsql				\
 	ICSharpCode.SharpZipLib		\
+	Compat.ICSharpCode.SharpZipLib	\
 	ByteFX.Data			\
 	Commons.Xml.Relaxng		\
 	Novell.Directory.Ldap		\
@@ -65,20 +80,35 @@ SUBDIRS = \
 	Mono.Http			\
 	Microsoft.Vsa			\
 	Mono.Cairo                      \
-	IBM.Data.DB2			
+	IBM.Data.DB2			\
+	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		\
+	System.Transactions
+
+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
 
@@ -103,6 +133,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) $@
@@ -110,6 +141,9 @@ lib/monolite:
 $(monolite_files): lib/monolite/%: lib/basic/% lib/monolite
 	cp -p $< $@
 
+$(basic_files:%=lib/basic/%):
+	cd $(topdir) && $(MAKE) profile-do--basic--all
+
 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/%)