Moved and integrated the exiting threads.

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index a221b15a0120ee42cee444e702cdc94a6f2da6cd..696220b46c84937e7f02ab6be908c4785531ae59 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,14 +1,14 @@
 thisdir = class
 
 MONO_POSIX := Mono.Posix
-MONO_CSHARP_DEBUGGER := Mono.CSharp.Debugger
+MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
 
 bootstrap_dirs := \
        corlib                                  \
        System                                  \
        System.XML                              \
        System                                  \
-       $(MONO_CSHARP_DEBUGGER)
+       $(MONO_SYMBOLWRITER)
 
 basic_SUBDIRS := corlib System System.XML System
 net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) Mono.Security
@@ -39,7 +39,7 @@ SUBDIRS = \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
-       $(MONO_CSHARP_DEBUGGER)         \
+       $(MONO_SYMBOLWRITER)            \
        Mono.Data.SqliteClient          \
        Mono.Data.SybaseClient          \
        Mono.Data.TdsClient             \
@@ -48,7 +48,7 @@ SUBDIRS = \
        Accessibility                   \
        Microsoft.VisualC               \
        Cscompmgd                       \
-       System.Windows.Forms            \
+       Managed.Windows.Forms           \
        Microsoft.VisualBasic           \
        System.Design                   \
        PEAPI                           \
@@ -76,12 +76,9 @@ SUBDIRS = \
 # These libraries below are either unimplemented or don't compile, but
 # I wrote makefiles for them.
 
-# Managed.Windows.Forms will move to the main SUBDIRS soon.
-
 DIST_ONLY_SUBDIRS = \
        Custommarshalers                \
-       Mono.Globalization              \
-       Managed.Windows.Forms
+       Mono.Globalization
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -96,19 +93,24 @@ DISTFILES = \
        doc/API-notes           \
        doc/NUnitGuidelines     \
        doc/TemplateTest.cs     \
-       notes/BitVecto32.txt
+       notes/BitVecto32.txt    \
+       $(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 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
 
-lib/basic.tar.gz: $(basic_files:%=lib/basic/%)
-       cd lib && { tar cvf - $(basic_files:%=basic/%) | gzip > basic.tar.gz; }
+lib/monolite:
+       $(MKINSTALLDIRS) $@
+
+$(monolite_files): lib/monolite/%: lib/basic/% lib/monolite
+       cp -p $< $@
 
-dist-local: dist-default lib/basic.tar.gz
+dist-default: $(monolite_files)
+dist-local: dist-default
        -$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%)
-       cp lib/basic.tar.gz $(distdir)/lib