Merge pull request #2611 from akoeplinger/cleanup

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 3e336f985322c2432cac9a767a64a41f79cdf98b..ee6e39dcc86cb40c84c98bcbdc0d8f55beacdf35 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -51,7 +51,10 @@ mobile_common_dirs := \
        System.Windows \
        System.Xml.Serialization \
        Mono.CSharp     \
-       Microsoft.CSharp
+       Microsoft.CSharp \
+       Mono.Security.Providers.DotNet  \
+       Mono.Security.Providers.NewSystemSource \
+       Mono.Security.Providers.NewTls
 
 mobile_static_dirs := \
        $(mobile_common_dirs)   \
@@ -73,6 +76,7 @@ monotouch_dirs := \
        $(mobile_static_dirs)
 
 monotouch_watch_dirs := $(monotouch_dirs)
+monotouch_tv_dirs   := $(monotouch_dirs)
 
 monotouch_runtime_dirs := \
        corlib \
@@ -81,6 +85,9 @@ monotouch_runtime_dirs := \
        System.XML \
        Mono.CSharp
 
+monotouch_watch_runtime_dirs := $(monotouch_runtime_dirs)
+monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
+
 xammac_4_5_dirs := \
        corlib  \
        System  \
@@ -123,6 +130,10 @@ xammac_4_5_dirs := \
        Mono.CompilerServices.SymbolWriter      \
        System.Data.Linq                \
        System.Net.Http \
+       Mono.Security.Providers.DotNet \
+       Mono.Security.Providers.OldTls \
+       Mono.Security.Providers.NewSystemSource \
+       Mono.Security.Providers.NewTls \
        $(pcl_facade_dirs)
 
 net_4_x_dirs := \
@@ -136,6 +147,8 @@ net_4_x_dirs := \
        System.Security                 \
        System.Configuration    \
        $(resgen_dir)                   \
+       System.IO.Compression           \
+       System.IO.Compression.FileSystem \
        System.Drawing                  \
        System.Transactions             \
        System.EnterpriseServices       \
@@ -205,7 +218,9 @@ net_4_x_dirs := \
        System.Net.Http.Formatting \
        System.Web.Http \
        System.Web.Http.SelfHost \
-       System.Web.Http.WebHost
+       System.Web.Http.WebHost \
+       Mono.Security.Providers.NewSystemSource \
+       Mono.Security.Providers.NewTls
 
 # These are the subdirs which depends on libs in net_4_x_dirs
 # or have proper dependencies between each other
@@ -246,10 +261,10 @@ net_4_x_parallel_dirs := \
        System.Json.Microsoft \
        System.Threading.Tasks.Dataflow \
        System.ComponentModel.Composition.4.5 \
-       System.IO.Compression \
-       System.IO.Compression.FileSystem \
        System.Windows \
        System.Xml.Serialization \
+       Mono.Security.Providers.DotNet \
+       Mono.Security.Providers.OldTls \
        System.DirectoryServices.Protocols      \
        RabbitMQ.Client                 \
        Microsoft.VisualC               \
@@ -271,7 +286,10 @@ xbuild_4_0_dirs := \
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
 monotouch_watch_SUBDIRS := $(monotouch_watch_dirs)
+monotouch_tv_SUBDIRS    := $(monotouch_tv_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
+monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs)
+monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
@@ -308,12 +326,15 @@ DISTFILES = \
        notes/BitVecto32.txt    \
        MicrosoftAjaxLibrary/License.htm        \
        test-helpers/NetworkHelpers.cs  \
+       test-helpers/SocketResponder.cs \
        $(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
        @:
 
+all-local-aot:
+
 # Files needed to bootstrap C# compiler
 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/%)