Merge pull request #631 from kebby/master

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index d45dbe0848e24b4bbc8624d17189c891ac2b76a4..25b3a835c71f68f79c484a98327fb93bc80e23ea 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -47,6 +47,7 @@ common_dirs := \
        System.Data                     \
        Accessibility                   \
        Mono.WebBrowser                 \
+       System.Runtime.Serialization.Formatters.Soap \
        Managed.Windows.Forms           \
        Mono.Data.Sqlite                \
        System.Web.ApplicationServices  \
@@ -54,7 +55,6 @@ common_dirs := \
        Mono.Web                        \
        System.Web.Services             \
        System.Web                      \
-       System.Runtime.Serialization.Formatters.Soap \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
@@ -106,7 +106,6 @@ net_2_0_dirs := \
        System.ComponentModel.DataAnnotations   \
        System.Web.DynamicData          \
        System.ServiceModel.Web         \
-       System.Web.Mvc                  \
        System.Web.Mvc2                 \
        Mono.C5                         \
        Mono.Management                 \
@@ -116,7 +115,8 @@ net_2_0_dirs := \
        System.Dynamic                  \
        Mono.CSharp                     \
        Moonlight.Build.Tasks           \
-       System.Net
+       System.Net                              \
+       System.Json
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
@@ -124,25 +124,12 @@ net_2_0_only_dirs := \
        Compat.ICSharpCode.SharpZipLib  \
        WindowsBase                     \
        System.Data.Services.Client     \
-       System.Data.Services
-
-moonlight_raw_dirs := \
-       corlib                  \
-       System                  \
-       Mono.CompilerServices.SymbolWriter \
-       System.Core             \
-       System.XML              \
-       System.Net              \
-       System.Xml.Linq \
-       System.Runtime.Serialization    \
-       System.ServiceModel     \
-       System.ServiceModel.Web \
-       System.Xml.Serialization
+       System.Data.Services            \
+       System.Web.Mvc                  
 
 mobile_dirs := \
        corlib  \
        System  \
-       Mono.CompilerServices.SymbolWriter      \
        System.Core     \
        System.XML      \
        Mono.Security   \
@@ -160,7 +147,50 @@ mobile_dirs := \
        Mono.Cairo      \
        Mono.Data.Sqlite        \
        System.Numerics \
-       System.Data.Services.Client
+       System.Data.Services.Client \
+       System.IO.Compression \
+       System.IO.Compression.FileSystem \
+       System.ComponentModel.DataAnnotations \
+       System.ComponentModel.Composition.4.5 \
+       System.Net \
+       System.Windows \
+       System.Xml.Serialization \
+       Facades
+
+monodroid_dirs := \
+       Mono.CompilerServices.SymbolWriter      \
+       Mono.CSharp     \
+       Microsoft.CSharp \
+       System.Net.Http
+
+monotouch_runtime_dirs := \
+       corlib \
+       System \
+       System.XML      \
+       Mono.Posix \
+       System.Core \
+       Mono.Security                   \
+       System \
+       System.Security                 \
+       System.Configuration            \
+       System                          \
+       System.XML                      \
+       $(resgen_dir)                   \
+       System.Drawing                  \
+       System.Transactions             \
+       System.EnterpriseServices       \
+       Mono.Data.Tds                   \
+       System.Data                     \
+       Accessibility                   \
+       Mono.WebBrowser                 \
+       System.Runtime.Serialization.Formatters.Soap \
+       Managed.Windows.Forms           \
+       Mono.Data.Sqlite                \
+       System.Web.ApplicationServices  \
+       System.Web \
+       Mono.Web \
+       System.Web.Services \
+       System.Web
 
 net_3_5_only_dirs := \
        Microsoft.Build.Framework       \
@@ -179,13 +209,23 @@ net_4_0_dirs := \
        System.ServiceModel.Discovery \
        System.Runtime.Caching \
        System.Runtime.DurableInstancing \
-       Mono.CodeContracts \
        Mono.Parallel \
+       System.Reactive.Interfaces \
+       System.Reactive.Core \
+       System.Reactive.Linq \
+       System.Reactive.PlatformServices \
+       System.Reactive.Providers \
+       System.Reactive.Runtime.Remoting \
+       System.Reactive.Windows.Forms \
+       System.Reactive.Windows.Threading \
+       System.Reactive.Experimental \
+       System.Reactive.Debugger \
        Microsoft.Web.Infrastructure \
        WebMatrix.Data \
        System.Data.Services.Client     \
-       System.Data.Services    \
-       System.Json
+       System.Data.Services \
+       System.Json.Microsoft \
+       monodoc
        
 net_4_0_only_dirs := \
        System.ComponentModel.Composition
@@ -193,12 +233,29 @@ net_4_0_only_dirs := \
 net_4_5_dirs := \
        System.Threading.Tasks.Dataflow \
        System.ComponentModel.Composition.4.5 \
-       System.Net.Http
-
+       System.Net.Http \
+       System.Web.Razor \
+       System.Web.WebPages.Deployment \
+       System.Web.WebPages \
+       System.Web.WebPages.Razor \
+       System.Web.Mvc3 \
+       System.Net.Http.Formatting \
+       System.Web.Http \
+       System.Web.Http.SelfHost \
+       System.Web.Http.WebHost \
+       EntityFramework \
+       EntityFramework.SqlServer       \
+       Mono.CodeContracts \
+       System.IO.Compression \
+       System.IO.Compression.FileSystem \
+       System.Windows \
+       System.Xml.Serialization \
+       Facades
+       
 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) Mono.CSharp Microsoft.CSharp
+monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
 monotouch_SUBDIRS := $(mobile_dirs)
+monotouch_runtime_SUBDIRS := $(monotouch_runtime_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)
@@ -206,9 +263,9 @@ net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_3_5_only_dirs) $(moonlight_raw_dirs) $(mobile_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+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)
 
-DIST_ONLY_SUBDIRS = dlr IKVM.Reflection aot-compiler
+DIST_ONLY_SUBDIRS = dlr aot-compiler
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -220,6 +277,7 @@ DISTFILES = \
        mono.pub                \
        msfinal.pub             \
        silverlight.pub         \
+       reactive.pub            \
        mono.snk                \
        LICENSE                 \
        README                  \