2009-07-11 Michael Barker <mike@middlesoft.co.uk>

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 7055b6f9ec09041b2d8c997208767490dd38c314..441bae50e7846679b5fbc8957747c1a870f15803 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -77,7 +77,6 @@ common_dirs := \
        RabbitMQ.Client                 \
        Mono.Messaging                  \
        System.Messaging                \
-       Mono.Messaging.RabbitMQ         \
        System.ServiceProcess           \
        System.Drawing.Design           \
        System.Design                   \
@@ -87,12 +86,13 @@ common_dirs := \
        IBM.Data.DB2                    \
        Microsoft.JScript               \
        CustomMarshalers                \
-       OpenSystem.C
+       OpenSystem.C                    \
+       Mono.Cecil                      \
+       Mono.Cecil.Mdb                  \
+       SystemWebTestShim
 
 net_1_1_dirs :=                \
-       FirebirdSql.Data.Firebird       \
-       Mono.Cecil                      \
-       Mono.Cecil.Mdb          \
+       FirebirdSql.Data.Firebird
 
 net_2_0_dirs := \
        Microsoft.Build.Framework       \
@@ -119,8 +119,9 @@ net_2_0_dirs := \
        Mono.Management                 \
        Mono.Options                    \
        Mono.Simd                       \
-       Mono.Tasklets
-       
+       Mono.Tasklets       \
+       Mono.Messaging.RabbitMQ
+
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
        System.Web.Extensions.Design_1.0
@@ -144,6 +145,10 @@ net_3_5_dirs := \
        Microsoft.Build.Tasks           \
        System.Web.Extensions.Design    
 
+net_4_0_dirs := \
+       System.Dynamic          \
+       Microsoft.CSharp
+
 net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
 net_1_1_SUBDIRS := $(common_dirs) $(net_1_1_dirs)
 net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
@@ -152,11 +157,11 @@ net_2_1_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter
 net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
 net_3_5_SUBDIRS := $(net_3_5_dirs)
 net_4_0_bootstrap_SUBDIRS := $(bootstrap_dirs) PEAPI
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
+net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
+SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_2_1_dirs) $(net_3_5_dirs) $(net_4_0_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
 #BROKEN_SUBDIRS =