* Makefile (centum_tests): Add Mono.Security and

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 9e88ce31e67be51b2957b595b6cca51163d7d391..c69a59f8c5d5a0ce9efc73252b14ff62298dc46c 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,17 +1,22 @@
 thisdir = class
 
 MONO_POSIX := Mono.Posix
-MONO_CSHARP_DEBUGGER := Mono.CSharp.Debugger
+MONO_SYMBOLWRITER := Mono.CompilerServices.SymbolWriter
 
 bootstrap_dirs := \
        corlib                                  \
        System                                  \
        System.XML                              \
+       Mono.Security                           \
+       System.Security                         \
        System                                  \
-       $(MONO_CSHARP_DEBUGGER)
+       $(MONO_SYMBOLWRITER)
 
-basic_SUBDIRS := corlib System System.XML
-net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) Mono.Security
+# 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) PEAPI
 net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 
 include ../build/rules.make
@@ -21,15 +26,15 @@ include ../build/rules.make
 SUBDIRS = \
        corlib                          \
        System                          \
-       I18N                            \
        System.XML                      \
+       Mono.Security                   \
+       System.Security                 \
        System                          \
+       I18N                            \
        System.Drawing                  \
        System.EnterpriseServices       \
        Mono.C5                         \
-       Mono.Security                   \
        Mono.Data.Tds                   \
-       System.Security                 \
        System.Data                     \
        Mono.Data                       \
        Mono.GetOptions                 \
@@ -39,7 +44,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 +53,7 @@ SUBDIRS = \
        Accessibility                   \
        Microsoft.VisualC               \
        Cscompmgd                       \
-       System.Windows.Forms            \
+       Managed.Windows.Forms           \
        Microsoft.VisualBasic           \
        System.Design                   \
        PEAPI                           \
@@ -65,8 +70,8 @@ SUBDIRS = \
        Mono.Http                       \
        Microsoft.Vsa                   \
        Mono.Cairo                      \
-       IBM.Data.DB2                         
-#      Microsoft.JScript               \
+       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
@@ -76,12 +81,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 +98,27 @@ 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
+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 $< $@
+
+$(basic_files:%=lib/basic/%):
+       cd $(topdir) && $(MAKE) profile-do--basic--all
 
-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