Merge pull request #2003 from esdrubal/seq_test_fix2

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1bbe6d2b0dc37e6d3d0858e7e071068993b264a1..3e336f985322c2432cac9a767a64a41f79cdf98b 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -26,38 +26,42 @@ mobile_common_dirs := \
        Mono.Security   \
        System  \
        I18N            \
-       System.Xml.Linq \
+       System.ServiceModel.Internals   \
+       SMDiagnostics   \
        System.Runtime.Serialization    \
+       System.Xml.Linq \
        System.ServiceModel     \
        System.ServiceModel.Web \
        System.Json     \
        System.Web.Services     \
        Mono.Data.Tds   \
        System.Transactions     \
+       System.Numerics \
        System.Data     \
        Mono.Cairo      \
        Mono.Data.Sqlite        \
-       System.Numerics \
        System.Data.Services.Client \
        System.IO.Compression \
        System.IO.Compression.FileSystem \
        System.ComponentModel.DataAnnotations \
        System.ComponentModel.Composition.4.5 \
        System.Net \
+       System.Net.Http \
+       System.Net.Http.WebRequest      \
        System.Windows \
        System.Xml.Serialization \
        Mono.CSharp     \
-       Microsoft.CSharp \
-       $(pcl_facade_dirs)
+       Microsoft.CSharp
 
 mobile_static_dirs := \
        $(mobile_common_dirs)   \
-       Mono.Dynamic.Interpreter
+       Mono.Dynamic.Interpreter        \
+       $(pcl_facade_dirs)
 
 mobile_dynamic_dirs := \
        $(mobile_common_dirs)   \
        Mono.CompilerServices.SymbolWriter      \
-       System.Net.Http
+       $(pcl_facade_dirs)
 
 xammac_dirs := \
        $(mobile_dynamic_dirs)
@@ -68,6 +72,8 @@ monodroid_dirs := \
 monotouch_dirs := \
        $(mobile_static_dirs)
 
+monotouch_watch_dirs := $(monotouch_dirs)
+
 monotouch_runtime_dirs := \
        corlib \
        System \
@@ -75,7 +81,51 @@ monotouch_runtime_dirs := \
        System.XML \
        Mono.CSharp
 
-net_4_5_dirs := \
+xammac_4_5_dirs := \
+       corlib  \
+       System  \
+       Mono.Posix                      \
+       System.Core     \
+       System.XML      \
+       Mono.Security   \
+       System  \
+       I18N            \
+       System.ServiceModel.Internals   \
+       SMDiagnostics   \
+       System.Numerics \
+       Mono.Data.Tds   \
+       System.Transactions     \
+       System.EnterpriseServices       \
+       System.Data     \
+       System.Runtime.Serialization    \
+       System.Xml.Linq \
+       Mono.Data.Sqlite        \
+       System.Runtime.Serialization.Formatters.Soap \
+       System.ComponentModel.DataAnnotations \
+       System.IdentityModel            \
+       System.IdentityModel.Selectors  \
+       Mono.Messaging                  \
+       System.Configuration.Install    \
+       System.Messaging                \
+       System.Web.Services \
+       System.ServiceModel     \
+       System.ServiceModel.Web \
+       System.Json     \
+       System.Data.Services.Client \
+       System.IO.Compression \
+       System.IO.Compression.FileSystem \
+       System.ComponentModel.Composition.4.5 \
+       System.Net \
+       System.Windows \
+       System.Xml.Serialization \
+       Mono.CSharp     \
+       Microsoft.CSharp \
+       Mono.CompilerServices.SymbolWriter      \
+       System.Data.Linq                \
+       System.Net.Http \
+       $(pcl_facade_dirs)
+
+net_4_x_dirs := \
        corlib                          \
        System                          \
        System.XML                      \
@@ -90,16 +140,21 @@ net_4_5_dirs := \
        System.Transactions             \
        System.EnterpriseServices       \
        Mono.Data.Tds                   \
+       System.Numerics         \
+       System.Numerics.Vectors         \
        System.Data                     \
        System.ComponentModel.DataAnnotations   \
        Accessibility                   \
        Mono.WebBrowser                 \
        System.Runtime.Serialization.Formatters.Soap \
-       Managed.Windows.Forms           \
+       System.Windows.Forms            \
        Mono.Data.Sqlite                \
        System.Web.ApplicationServices  \
+       Novell.Directory.Ldap           \
+       System.DirectoryServices        \
        System.Web                      \
        System.Web.Services             \
+       System.Design                   \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
@@ -110,16 +165,18 @@ net_4_5_dirs := \
        System.Messaging                \
        System.ServiceProcess           \
        System.Drawing.Design           \
-       System.Design                   \
        ICSharpCode.SharpZipLib         \
        IBM.Data.DB2                    \
        CustomMarshalers                \
        SystemWebTestShim                       \
-       System.Xml.Linq                 \
+       System.ServiceModel.Internals   \
+       SMDiagnostics   \
        System.Runtime.Serialization    \
+       System.Xml.Linq                 \
        System.Data.Linq                \
        System.Web.Abstractions         \
        System.Web.Routing              \
+       System.Runtime.DurableInstancing \
        System.IdentityModel            \
        System.IdentityModel.Selectors  \
        System.ServiceModel             \
@@ -136,7 +193,6 @@ net_4_5_dirs := \
        System.ServiceModel.Routing \
        System.ServiceModel.Discovery \
        System.Runtime.Caching \
-       System.Runtime.DurableInstancing \
        Microsoft.Web.Infrastructure \
        System.ServiceModel.Web \
        System.Net.Http \
@@ -151,9 +207,9 @@ net_4_5_dirs := \
        System.Web.Http.SelfHost \
        System.Web.Http.WebHost
 
-# These are the subdirs which depends on libs in net_4_5_dirs
+# These are the subdirs which depends on libs in net_4_x_dirs
 # or have proper dependencies between each other
-net_4_5_parallel_dirs := \
+net_4_x_parallel_dirs := \
        PEAPI                           \
        I18N                            \
        Mono.Http                       \
@@ -194,9 +250,6 @@ net_4_5_parallel_dirs := \
        System.IO.Compression.FileSystem \
        System.Windows \
        System.Xml.Serialization \
-       System.Numerics         \
-       Novell.Directory.Ldap           \
-       System.DirectoryServices        \
        System.DirectoryServices.Protocols      \
        RabbitMQ.Client                 \
        Microsoft.VisualC               \
@@ -217,19 +270,21 @@ xbuild_4_0_dirs := \
 
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
+monotouch_watch_SUBDIRS := $(monotouch_watch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
-net_4_0_SUBDIRS := reference-assemblies
-net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs)
-net_4_5_PARALLEL_SUBDIRS := $(net_4_5_parallel_dirs) aot-compiler
+xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs)
+binary_reference_assemblies_SUBDIRS := reference-assemblies
+net_4_x_SUBDIRS := $(net_4_x_dirs) $(xbuild_4_0_dirs)
+net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(net_4_5_parallel_dirs)
+SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
 
@@ -252,6 +307,7 @@ DISTFILES = \
        doc/TemplateTest.cs     \
        notes/BitVecto32.txt    \
        MicrosoftAjaxLibrary/License.htm        \
+       test-helpers/NetworkHelpers.cs  \
        $(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
@@ -277,3 +333,5 @@ dist-local: dist-default
 
 csproj-local:
 
+do-clean:
+       $(RM) -rf $(topdir)/class/lib/$(PROFILE)