Merge pull request #631 from kebby/master

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index a7af39076b0e73e16aaf8e5b59eafbd222bc7129..25b3a835c71f68f79c484a98327fb93bc80e23ea 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -127,19 +127,6 @@ net_2_0_only_dirs := \
        System.Data.Services            \
        System.Web.Mvc                  
 
-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
-
 mobile_dirs := \
        corlib  \
        System  \
@@ -161,18 +148,20 @@ mobile_dirs := \
        Mono.Data.Sqlite        \
        System.Numerics \
        System.Data.Services.Client \
-       System.Reactive.Interfaces \
-       System.Reactive.Core \
-       System.Reactive.Linq \
-       System.Reactive.PlatformServices \
-       System.Reactive.Experimental \
-       System.Reactive.Debugger
+       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.Reactive.Providers
+       System.Net.Http
 
 monotouch_runtime_dirs := \
        corlib \
@@ -216,6 +205,11 @@ net_4_0_dirs := \
        System.Windows.Forms.DataVisualization  \
        System.Xaml \
        WindowsBase \
+       System.ServiceModel.Routing \
+       System.ServiceModel.Discovery \
+       System.Runtime.Caching \
+       System.Runtime.DurableInstancing \
+       Mono.Parallel \
        System.Reactive.Interfaces \
        System.Reactive.Core \
        System.Reactive.Linq \
@@ -226,16 +220,12 @@ net_4_0_dirs := \
        System.Reactive.Windows.Threading \
        System.Reactive.Experimental \
        System.Reactive.Debugger \
-       System.ServiceModel.Routing \
-       System.ServiceModel.Discovery \
-       System.Runtime.Caching \
-       System.Runtime.DurableInstancing \
-       Mono.Parallel \
        Microsoft.Web.Infrastructure \
        WebMatrix.Data \
        System.Data.Services.Client     \
        System.Data.Services \
-       System.Json.Microsoft
+       System.Json.Microsoft \
+       monodoc
        
 net_4_0_only_dirs := \
        System.ComponentModel.Composition
@@ -252,12 +242,17 @@ net_4_5_dirs := \
        System.Net.Http.Formatting \
        System.Web.Http \
        System.Web.Http.SelfHost \
+       System.Web.Http.WebHost \
        EntityFramework \
        EntityFramework.SqlServer       \
-       Mono.CodeContracts
-
+       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) $(monodroid_dirs)
 monotouch_SUBDIRS := $(mobile_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
@@ -268,7 +263,7 @@ 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 aot-compiler