Merge pull request #732 from wtfrank/charting

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 03d27e379097f809b38db55574267c719286ea9f..414b282411fd98da15d7f7cb7075b4c69d381e0a 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -68,6 +68,7 @@ common_dirs := \
        Novell.Directory.Ldap           \
        Mono.Security.Win32             \
        System.DirectoryServices        \
+       System.DirectoryServices.Protocols      \
        RabbitMQ.Client                 \
        Mono.Messaging                  \
        System.Messaging                \
@@ -127,19 +128,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,49 +149,23 @@ 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.Net.Http
+       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 \
-       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      \
-       System.Net.Http
+       corlib
 
 net_3_5_only_dirs := \
        Microsoft.Build.Framework       \
@@ -247,6 +209,7 @@ net_4_5_dirs := \
        System.Threading.Tasks.Dataflow \
        System.ComponentModel.Composition.4.5 \
        System.Net.Http \
+       System.Net.Http.WebRequest \
        System.Web.Razor \
        System.Web.WebPages.Deployment \
        System.Web.WebPages \
@@ -255,15 +218,21 @@ 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)
+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)
@@ -271,7 +240,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