[fix] #639939: Manually and properly convert the bytes returned by XLookupString.

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index e32a0a8d0f9f38f8fc2a6c4f0ff5de31a6b1ad19..c3b59c7382484ed8cf196d34d54fb98882fe1ef4 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -37,6 +37,7 @@ common_dirs := \
        System.Configuration            \
        System                          \
        System.XML                      \
+       aot-compiler            \
        I18N                            \
        System.Drawing                  \
        System.Transactions             \
@@ -116,12 +117,20 @@ net_2_0_dirs := \
        Mono.CSharp                     \
        Moonlight.Build.Tasks           \
        WindowsBase                     \
-       System.Data.Services
+       System.Data.Services    \
+       System.Data.Services.Client \
+       System.Net
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
        System.Web.Extensions.Design_1.0
 
+net_2_1_bootstrap_dirs := \
+       corlib          \
+       System          \
+       Mono.CompilerServices.SymbolWriter      \
+       System.Core
+
 moonlight_dirs := \
        corlib                  \
        Mono.CompilerServices.SymbolWriter \
@@ -135,7 +144,7 @@ moonlight_dirs := \
        System.ServiceModel     \
        System.ServiceModel.Web
 
-monotouch_dirs := \
+mobile_dirs := \
        corlib  \
        Mono.CompilerServices.SymbolWriter      \
        System.Core     \
@@ -155,15 +164,12 @@ monotouch_dirs := \
        System.Data     \
        Mono.Cairo      \
        Mono.Data.Sqlite
-
-net_3_5_dirs := \
+       
+net_3_5_only_dirs := \
        Microsoft.Build.Framework       \
        Microsoft.Build.Utilities       \
        Microsoft.Build.Engine          \
-       Microsoft.Build.Tasks           \
-       Moonlight.Build.Tasks           \
-       System.Web.Extensions.Design    \
-       System.Data.Services.Client
+       Microsoft.Build.Tasks
 
 net_4_0_dirs := \
        System.Dynamic          \
@@ -173,22 +179,26 @@ net_4_0_dirs := \
        System.ComponentModel.Composition \
        System.Xaml \
        System.ServiceModel.Routing \
+       System.ServiceModel.Discovery \
        System.Runtime.Caching \
-       System.Runtime.DurableInstancing
+       System.Runtime.DurableInstancing \
+       Mono.CodeContracts
 
 net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs)
-moonlight_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
+moonlight_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
 moonlight_raw_SUBDIRS := $(moonlight_dirs)
-monotouch_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
-monotouch_SUBDIRS := $(monotouch_dirs)
-net_3_5_SUBDIRS := $(net_3_5_dirs)
+monodroid_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
+monodroid_SUBDIRS := $(mobile_dirs)
+monotouch_bootstrap_SUBDIRS := $(net_2_1_bootstrap_dirs)
+monotouch_SUBDIRS := $(mobile_dirs)
+net_3_5_SUBDIRS := $(net_3_5_only_dirs)
 net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) Mono.Posix System.Core
 net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(monotouch_dirs) $(net_3_5_dirs) $(net_4_0_dirs)
+SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(mobile_dirs) $(net_4_0_dirs)
 
 DIST_ONLY_SUBDIRS = dlr