Merge pull request #1142 from edbprx/master

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index db444031339d1f89907d9ace83a5f1b52cc9156e..b3d367cb2e04d080cd5782ecc11b6e830a2a4343 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -25,7 +25,7 @@ net_1_1_java_SUBDIRS = \
        System.Runtime.Serialization.Formatters.Soap    \
        System.Runtime.Remoting
 
-common_dirs := \
+net_2_0_dirs := \
        corlib                          \
        System                          \
        System.XML                      \
@@ -33,11 +33,8 @@ common_dirs := \
        Mono.Posix                      \
        System.Core                     \
        Mono.Security                   \
-       System                          \
        System.Security                 \
        System.Configuration            \
-       System                          \
-       System.XML                      \
        I18N                            \
        $(resgen_dir)                   \
        System.Drawing                  \
@@ -52,16 +49,13 @@ common_dirs := \
        Mono.Data.Sqlite                \
        System.Web.ApplicationServices  \
        System.Web                      \
-       Mono.Web                        \
        System.Web.Services             \
-       System.Web                      \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
        System.Data.OracleClient        \
        Microsoft.VisualC               \
        Cscompmgd                       \
-       System.Design                   \
        PEAPI                           \
        Npgsql                          \
        Commons.Xml.Relaxng             \
@@ -81,22 +75,14 @@ common_dirs := \
        Mono.Cairo                      \
        IBM.Data.DB2                    \
        CustomMarshalers                \
-       OpenSystem.C                    \
        Mono.Cecil                      \
        Mono.Cecil.Mdb                  \
        Mono.Debugger.Soft              \
-       SystemWebTestShim
-
-net_2_0_dirs := \
-       Microsoft.Build.Framework       \
-       Microsoft.Build.Utilities       \
-       Microsoft.Build.Engine          \
-       Microsoft.Build.Tasks           \
+       SystemWebTestShim                       \
        System.Xml.Linq                 \
        System.Runtime.Serialization    \
        System.Data.DataSetExtensions   \
        System.Data.Linq                \
-       System.Web                      \
        System.Web.Abstractions         \
        System.Web.Routing              \
        System.IdentityModel            \
@@ -114,16 +100,15 @@ net_2_0_dirs := \
        Mono.Tasklets                   \
        System.Dynamic                  \
        Mono.CSharp                     \
-       Moonlight.Build.Tasks           \
-       System.Net                              \
+       System.Net                      \
        System.Json
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
-       System.Web.Extensions.Design_1.0        \
+       System.Web.Extensions.Design_1.0\
        Compat.ICSharpCode.SharpZipLib  \
        WindowsBase                     \
-       System.ServiceModel.Web \
+       System.ServiceModel.Web         \
        System.Data.Services.Client     \
        System.Data.Services            \
        System.Web.Mvc \
@@ -166,24 +151,31 @@ monodroid_dirs := \
        Microsoft.CSharp \
        System.Net.Http
 
+xammac_dirs := \
+       Mono.CompilerServices.SymbolWriter      \
+       Mono.CSharp     \
+       Microsoft.CSharp \
+       System.Net.Http
+
 monotouch_runtime_dirs := \
-       corlib
+       corlib \
+       System \
+       System.Core \
+       System.XML \
+       Mono.CSharp
 
-net_3_5_only_dirs := \
-       Microsoft.Build.Framework       \
-       Microsoft.Build.Utilities       \
-       Microsoft.Build.Engine          \
-       Microsoft.Build.Tasks
+monotouch_dirs := \
+       Mono.CSharp     \
+       Microsoft.CSharp \
+       Mono.Dynamic.Interpreter
 
 net_4_0_dirs := \
        System.Numerics         \
        Microsoft.CSharp        \
-       Microsoft.Build         \
        System.Windows.Forms.DataVisualization  \
        System.Xaml \
        WindowsBase \
        System.ServiceModel.Activation \
-       System.ServiceModel \
        System.ServiceModel.Routing \
        System.ServiceModel.Discovery \
        System.Runtime.Caching \
@@ -197,6 +189,7 @@ net_4_0_dirs := \
        System.Reactive.Runtime.Remoting \
        System.Reactive.Windows.Forms \
        System.Reactive.Windows.Threading \
+       System.Reactive.Observable.Aliases \
        System.Reactive.Experimental \
        System.Reactive.Debugger \
        Microsoft.Web.Infrastructure \
@@ -206,7 +199,7 @@ net_4_0_dirs := \
        System.Data.Services \
        System.Json.Microsoft \
        monodoc
-       
+
 net_4_0_only_dirs := \
        System.ComponentModel.Composition
 
@@ -232,22 +225,35 @@ net_4_5_dirs := \
        System.Windows \
        System.Xml.Serialization \
        $(pcl_facade_dirs)
-       
-net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
+
+xbuild_2_0_dirs := \
+       Microsoft.Build.Framework       \
+       Microsoft.Build.Utilities       \
+       Microsoft.Build.Engine          \
+       Mono.XBuild.Tasks               \
+       Microsoft.Build.Tasks
+
+xbuild_4_0_dirs := \
+       $(xbuild_2_0_dirs)      \
+       Microsoft.Build
+
+net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
 monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
-monotouch_SUBDIRS := $(mobile_dirs)
+monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_dirs)
 mobile_SUBDIRS := $(mobile_dirs)
-net_3_5_SUBDIRS := $(net_3_5_only_dirs)
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs)
-net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) aot-compiler
+xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs)
+net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
+net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
+net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
+xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_3_5_only_dirs) $(mobile_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
 
-DIST_ONLY_SUBDIRS = dlr aot-compiler
+DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -275,7 +281,7 @@ all-local $(STD_TARGETS:=-local):
        @:
 
 # Files needed to bootstrap C# compiler
-basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
+basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
 lib/monolite: