Merge pull request #4722 from alexanderkyte/checked_after

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 5463f65160f305ace1e967b1275821aa213b18f2..6f5d31f6a52575ce3c2909212acf5961fbd39fcf 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -23,10 +23,6 @@ basic_SUBDIRS := \
        $(MCS_MODE_dirs) \
        ../tools/cil-stringreplacer
 
-# resgen is corlib specific so we need to wait until corlib is build
-# and build it just a step before first dll needs it
-resgen_dir = ../tools/resgen
-
 build_SUBDIRS :=  \
        corlib \
        Mono.Security \
@@ -39,6 +35,7 @@ build_SUBDIRS :=  \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
        System.IO.Compression \
+       System.Drawing                  \
        Mono.Cecil \
        $(MCS_MODE_dirs) \
        Mono.CompilerServices.SymbolWriter      \
@@ -115,7 +112,9 @@ monodroid_dirs := \
        $(pcl_facade_dirs)
 
 monotouch_dirs := \
-       $(testing_aot_full_dirs)
+       $(mobile_common_dirs)   \
+       Mono.Simd                       \
+       $(pcl_facade_dirs)
 
 monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
 monotouch_tv_dirs   := $(monotouch_dirs)
@@ -131,7 +130,10 @@ monotouch_runtime_dirs := \
 monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs))
 monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
 
-winaot_dirs := $(monotouch_dirs) System.Drawing
+winaot_dirs := \
+       $(mobile_common_dirs)   \
+       System.Drawing                  \
+       $(pcl_facade_dirs)
 
 xammac_4_5_dirs := \
        corlib  \
@@ -192,10 +194,9 @@ net_4_x_dirs := \
        System.Core                     \
        System.Security                 \
        System.Configuration    \
-       $(resgen_dir)                   \
+       System.Drawing                  \
        System.IO.Compression           \
        System.IO.Compression.FileSystem \
-       System.Drawing                  \
        System.Transactions             \
        System.EnterpriseServices       \
        Mono.Data.Tds                   \
@@ -335,10 +336,10 @@ xbuild_4_0_dirs := \
        $(xbuild_2_0_dirs)      \
        Microsoft.Build
 
-orbis_exclude_dirs := \
-       Microsoft.CSharp \
-       Mono.CSharp \
-       Mono.Data.Sqlite
+orbis_dirs := \
+       $(filter-out Microsoft.CSharp Mono.CSharp Mono.Data.Sqlite,$(mobile_common_dirs))       \
+       System.Drawing          \
+       $(pcl_facade_dirs)
 
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
@@ -357,7 +358,7 @@ net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs)
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
 winaot_SUBDIRS := $(winaot_dirs)
-orbis_SUBDIRS := $(filter-out $(orbis_exclude_dirs),$(monotouch_dirs))
+orbis_SUBDIRS := $(orbis_dirs)
 
 include ../build/rules.make