X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMakefile;h=0b97206277844f86e7fed112cfbc75507bfaf448;hb=fc029667a106e1db8468ecba670dbdba42be4f19;hp=03cfb1be62801dd3ba8e8acb69d99a0a33d47e3f;hpb=dda0fa37366b468e36cd0914c64641c57380205d;p=mono.git

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 03cfb1be628..0b972062778 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,33 +1,48 @@
 thisdir = class
 
 MONO_POSIX := Mono.Posix
-MONO_CSHARP_DEBUGGER := Mono.CSharp.Debugger
+MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
 
 bootstrap_dirs := \
-	corlib 					\
+	corlib					\
 	System					\
 	System.XML				\
+	Mono.Security				\
+	System.Security				\
+	System.Configuration			\
 	System					\
-	$(MONO_CSHARP_DEBUGGER)
+	$(MONO_SYMBOLWRITER)
 
-basic_SUBDIRS := corlib System
-net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs)
-net_2_0_bootstrap_SUBDIRS := $(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
 
-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
 
-SUBDIRS = \
+default_SUBDIRS := \
 	corlib				\
 	System				\
-	I18N				\
 	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			\
@@ -37,21 +52,22 @@ SUBDIRS = \
 	System.Runtime.Remoting		\
 	System.Configuration.Install 	\
 	System.Management		\
-	$(MONO_CSHARP_DEBUGGER)         \
+	$(MONO_SYMBOLWRITER)		\
+	$(MONO_POSIX)			\
 	Mono.Data.SqliteClient		\
 	Mono.Data.SybaseClient		\
 	Mono.Data.TdsClient		\
 	System.Data.OracleClient	\
-	$(MONO_POSIX)			\
 	Accessibility			\
 	Microsoft.VisualC		\
 	Cscompmgd			\
-	System.Windows.Forms		\
+	Managed.Windows.Forms		\
 	Microsoft.VisualBasic		\
 	System.Design			\
 	PEAPI				\
 	Npgsql				\
 	ICSharpCode.SharpZipLib		\
+	Compat.ICSharpCode.SharpZipLib	\
 	ByteFX.Data			\
 	Commons.Xml.Relaxng		\
 	Novell.Directory.Ldap		\
@@ -63,40 +79,68 @@ SUBDIRS = \
 	Mono.Http			\
 	Microsoft.Vsa			\
 	Mono.Cairo                      \
-	IBM.Data.DB2			     
-#	Microsoft.JScript		\
+	IBM.Data.DB2			\
+	Microsoft.JScript		\
+	FirebirdSql.Data.Firebird
 
-# 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 ...
-#
-# Need a way to only build/test Mono.Security.Win32 on Windows.
-# It builds on linux, but make run-test will barf because a
-# DLL doesn't exist.
+net_2_0_ONLY_SUBDIRS := \
+	Microsoft.Build.Framework	\
+	Microsoft.Build.Utilities	\
+	Microsoft.Build.Engine		\
+	Microsoft.Build.Tasks
+
+net_2_0_SUBDIRS := $(default_SUBDIRS) $(net_2_0_ONLY_SUBDIRS)
+
+include ../build/rules.make
+
+SUBDIRS = $(default_SUBDIRS)
 
 # 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 = \
+	$(net_2_0_ONLY_SUBDIRS) \
+	$(BROKEN_SUBDIRS)
+
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
 
 DISTFILES = \
+	ecma.pub		\
+	mono.pub		\
+	msfinal.pub		\
+	mono.snk		\
 	LICENSE 		\
 	README			\
 	doc/API-notes		\
 	doc/NUnitGuidelines	\
-	doc/notes		\
-	notes/BitVecto32.txt
+	doc/TemplateTest.cs	\
+	notes/BitVecto32.txt	\
+	$(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
 	@:
 
-DIST_PROFILES = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
+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
+	cp -p $< $@
+
+$(basic_files:%=lib/basic/%):
+	cd $(topdir) && $(MAKE) profile-do--basic--all
 
+dist-default: $(monolite_files)
 dist-local: dist-default
-	-$(MKINSTALLDIRS) $(distdir)/lib $(DIST_PROFILES:%=$(distdir)/lib/%)
+	-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%) $(COMPAT_PROFILE_DIRS:%=$(distdir)/compat/%)