merge -r 53934:53935

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 8ca0b07bdf6be20d4204a1b2ce9bb7d8395bfd1c..0c1402c9972db7fa393810dba85383265ed7b5e8 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -4,15 +4,30 @@ 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)
+
+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
 
 include ../build/rules.make
 
@@ -22,14 +37,15 @@ SUBDIRS = \
        corlib                          \
        System                          \
        System.XML                      \
+       Mono.Security                   \
+       System.Configuration    \
        System                          \
+       System.Security                 \
        I18N                            \
        System.Drawing                  \
        System.EnterpriseServices       \
        Mono.C5                         \
-       Mono.Security                   \
        Mono.Data.Tds                   \
-       System.Security                 \
        System.Data                     \
        Mono.Data                       \
        Mono.GetOptions                 \
@@ -40,11 +56,11 @@ SUBDIRS = \
        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                       \
@@ -65,7 +81,9 @@ SUBDIRS = \
        Mono.Http                       \
        Microsoft.Vsa                   \
        Mono.Cairo                      \
-       IBM.Data.DB2                    
+       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
@@ -110,6 +128,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/%)