Merge pull request #2894 from marek-safar/mono.security

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index a0dd126efacb776fefa47b3c8ff98cb1d107d0fc..28ca14e770e9695ca2bb8ef167532d01de8f0a4c 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,8 +1,6 @@
 thisdir = class
 
-# Note that Mono.Security and System.Security aren't listed.
-# We may have to add those if 'mcs' starts using them.
-basic_SUBDIRS := corlib System System.XML System Mono.Security System.Core 
+basic_SUBDIRS := corlib Mono.Security System System.XML System.Core 
 
 # resgen is corlib specific so we need to wait until corlib is build
 # and build it just a step before first dll needs it
@@ -10,21 +8,22 @@ resgen_dir = ../tools/resgen
 
 build_SUBDIRS :=  \
        corlib \
+       Mono.Security \
        System \
        System.XML \
-       System Mono.Security \
        Mono.Posix \
-       System.Core
+       System.Core \
+       Mono.Cecil \
+       Mono.Cecil.Mdb
 
 pcl_facade_dirs := Facades
 
 mobile_common_dirs := \
        corlib  \
+       Mono.Security \
        System  \
        System.Core     \
        System.XML      \
-       Mono.Security   \
-       System  \
        I18N            \
        System.ServiceModel.Internals   \
        SMDiagnostics   \
@@ -53,7 +52,6 @@ mobile_common_dirs := \
        Mono.CSharp     \
        Microsoft.CSharp \
        Mono.Security.Providers.DotNet  \
-       Mono.Security.Providers.OldTls \
        Mono.Security.Providers.NewSystemSource \
        Mono.Security.Providers.NewTls
 
@@ -81,6 +79,7 @@ monotouch_tv_dirs   := $(monotouch_dirs)
 
 monotouch_runtime_dirs := \
        corlib \
+       Mono.Security \
        System \
        System.Core \
        System.XML \
@@ -91,12 +90,11 @@ monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
 
 xammac_4_5_dirs := \
        corlib  \
+       Mono.Security \
        System  \
        Mono.Posix                      \
        System.Core     \
        System.XML      \
-       Mono.Security   \
-       System  \
        I18N            \
        System.ServiceModel.Internals   \
        SMDiagnostics   \
@@ -139,12 +137,12 @@ xammac_4_5_dirs := \
 
 net_4_x_dirs := \
        corlib                          \
+       Mono.Security \
        System                          \
        System.XML                      \
        Mono.CompilerServices.SymbolWriter \
        Mono.Posix                      \
        System.Core                     \
-       Mono.Security                   \
        System.Security                 \
        System.Configuration    \
        $(resgen_dir)                   \
@@ -334,6 +332,8 @@ DISTFILES = \
 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/%)