Remove wrong using

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index c3b59c7382484ed8cf196d34d54fb98882fe1ef4..738a123f85db6e57b93c0aedf2f079c3d500f8eb 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,19 +1,20 @@
 thisdir = class
 
-bootstrap_dirs := \
-       corlib                                  \
-       Mono.CompilerServices.SymbolWriter      \
-       System                                  \
-       System.XML                              \
-       Mono.Security                           \
-       System.Security                         \
-       System.Configuration                    \
-       System
-
-
 # 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 Mono.Security Mono.CompilerServices.SymbolWriter System.Core
+basic_SUBDIRS := corlib System System.XML System Mono.Security System.Core 
+
+# resgen is corlib specific so we need to wait until corlib is build
+# and build it just a step before first dll needs it
+resgen_dir = ../tools/resgen
+
+build_SUBDIRS :=  \
+       corlib \
+       System \
+       System.XML \
+       System Mono.Security \
+       Mono.Posix \
+       System.Core
 
 net_1_1_java_SUBDIRS = \
        System.Xml                                      \
@@ -37,8 +38,8 @@ common_dirs := \
        System.Configuration            \
        System                          \
        System.XML                      \
-       aot-compiler            \
        I18N                            \
+       $(resgen_dir)                   \
        System.Drawing                  \
        System.Transactions             \
        System.EnterpriseServices       \
@@ -63,9 +64,6 @@ common_dirs := \
        System.Design                   \
        PEAPI                           \
        Npgsql                          \
-       Compat.ICSharpCode.SharpZipLib  \
-       ICSharpCode.SharpZipLib         \
-       Compat.ICSharpCode.SharpZipLib  \
        Commons.Xml.Relaxng             \
        Novell.Directory.Ldap           \
        Mono.Security.Win32             \
@@ -77,6 +75,7 @@ common_dirs := \
        System.ServiceProcess           \
        System.Drawing.Design           \
        System.Design                   \
+       ICSharpCode.SharpZipLib         \
        Mono.Http                       \
        Mono.Cairo                      \
        IBM.Data.DB2                    \
@@ -116,39 +115,34 @@ net_2_0_dirs := \
        Mono.Tasklets                   \
        Mono.CSharp                     \
        Moonlight.Build.Tasks           \
-       WindowsBase                     \
        System.Data.Services    \
-       System.Data.Services.Client \
        System.Net
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
-       System.Web.Extensions.Design_1.0
-
-net_2_1_bootstrap_dirs := \
-       corlib          \
-       System          \
-       Mono.CompilerServices.SymbolWriter      \
-       System.Core
+       System.Web.Extensions.Design_1.0        \
+       Compat.ICSharpCode.SharpZipLib  \
+       WindowsBase                     \
+       System.Data.Services.Client
 
-moonlight_dirs := \
+moonlight_raw_dirs := \
        corlib                  \
+       System                  \
        Mono.CompilerServices.SymbolWriter \
        System.Core             \
-       System                  \
        System.XML              \
        System.Net              \
        System.Xml.Linq \
-       System.Xml.Serialization        \
        System.Runtime.Serialization    \
        System.ServiceModel     \
-       System.ServiceModel.Web
+       System.ServiceModel.Web \
+       System.Xml.Serialization
 
 mobile_dirs := \
        corlib  \
+       System  \
        Mono.CompilerServices.SymbolWriter      \
        System.Core     \
-       System  \
        System.XML      \
        Mono.Security   \
        System  \
@@ -164,7 +158,7 @@ mobile_dirs := \
        System.Data     \
        Mono.Cairo      \
        Mono.Data.Sqlite
-       
+
 net_3_5_only_dirs := \
        Microsoft.Build.Framework       \
        Microsoft.Build.Utilities       \
@@ -178,29 +172,29 @@ net_4_0_dirs := \
        System.Windows.Forms.DataVisualization  \
        System.ComponentModel.Composition \
        System.Xaml \
+       WindowsBase \
+       System.Data.Services.Client \
        System.ServiceModel.Routing \
        System.ServiceModel.Discovery \
        System.Runtime.Caching \
        System.Runtime.DurableInstancing \
-       Mono.CodeContracts
+       Mono.CodeContracts \
+       Mono.Parallel \
+       Microsoft.Web.Infrastructure \
+       WebMatrix.Data
 
-net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
-net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs)
-moonlight_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
-moonlight_raw_SUBDIRS := $(moonlight_dirs)
-monodroid_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
+net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
+moonlight_raw_SUBDIRS := $(moonlight_raw_dirs)
 monodroid_SUBDIRS := $(mobile_dirs)
-monotouch_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
 monotouch_SUBDIRS := $(mobile_dirs)
 net_3_5_SUBDIRS := $(net_3_5_only_dirs)
-net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) Mono.Posix System.Core
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
+net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) aot-compiler
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(mobile_dirs) $(net_4_0_dirs)
+SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_raw_dirs) $(mobile_dirs) $(net_4_0_dirs)
 
-DIST_ONLY_SUBDIRS = dlr
+DIST_ONLY_SUBDIRS = dlr IKVM.Reflection aot-compiler
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -226,9 +220,8 @@ DISTFILES = \
 all-local $(STD_TARGETS:=-local):
        @:
 
-# What is this used for ?
-
-basic_files = gmcs.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
+# Files needed to bootstrap C# compiler
+basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
 lib/monolite:
@@ -239,7 +232,7 @@ $(monolite_files): lib/monolite/%: lib/basic/%
        cp -p $< $@
 
 $(basic_files:%=lib/basic/%):
-       cd $(topdir) && $(MAKE) profile-do--basic--all
+       cd $(topdir) && $(MAKE) profile-do--build--all NO_DIR_CHECK=1 SKIP_AOT=1
 
 dist-default: $(monolite_files)
 dist-local: dist-default