Merge pull request #1273 from joelmartinez/docs-unified-fix

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 8a71be346135fde0ba6f463261ad0b5823374dfb..8ca914dca5373d0df05d5f3c483ae2bccc3d8ba6 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -16,16 +16,7 @@ build_SUBDIRS :=  \
        Mono.Posix \
        System.Core
 
-net_1_1_java_SUBDIRS = \
-       System.Xml                                      \
-       System.Data                                     \
-       System.Drawing                                  \
-       Novell.Directory.Ldap                           \
-       System.DirectoryServices                        \
-       System.Runtime.Serialization.Formatters.Soap    \
-       System.Runtime.Remoting
-
-common_dirs := \
+net_2_0_dirs := \
        corlib                          \
        System                          \
        System.XML                      \
@@ -33,11 +24,8 @@ common_dirs := \
        Mono.Posix                      \
        System.Core                     \
        Mono.Security                   \
-       System                          \
        System.Security                 \
        System.Configuration            \
-       System                          \
-       System.XML                      \
        I18N                            \
        $(resgen_dir)                   \
        System.Drawing                  \
@@ -52,16 +40,13 @@ common_dirs := \
        Mono.Data.Sqlite                \
        System.Web.ApplicationServices  \
        System.Web                      \
-       Mono.Web                        \
        System.Web.Services             \
-       System.Web                      \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
        System.Data.OracleClient        \
        Microsoft.VisualC               \
        Cscompmgd                       \
-       System.Design                   \
        PEAPI                           \
        Npgsql                          \
        Commons.Xml.Relaxng             \
@@ -81,18 +66,14 @@ common_dirs := \
        Mono.Cairo                      \
        IBM.Data.DB2                    \
        CustomMarshalers                \
-       OpenSystem.C                    \
        Mono.Cecil                      \
        Mono.Cecil.Mdb                  \
        Mono.Debugger.Soft              \
-       SystemWebTestShim
-
-net_2_0_dirs := \
+       SystemWebTestShim                       \
        System.Xml.Linq                 \
        System.Runtime.Serialization    \
        System.Data.DataSetExtensions   \
        System.Data.Linq                \
-       System.Web                      \
        System.Web.Abstractions         \
        System.Web.Routing              \
        System.IdentityModel            \
@@ -110,22 +91,22 @@ net_2_0_dirs := \
        Mono.Tasklets                   \
        System.Dynamic                  \
        Mono.CSharp                     \
-       System.Net                              \
+       System.Net                      \
        System.Json
 
 net_2_0_only_dirs := \
        System.Web.Extensions_1.0       \
-       System.Web.Extensions.Design_1.0        \
+       System.Web.Extensions.Design_1.0\
        Compat.ICSharpCode.SharpZipLib  \
        WindowsBase                     \
-       System.ServiceModel.Web \
+       System.ServiceModel.Web         \
        System.Data.Services.Client     \
        System.Data.Services            \
        System.Web.Mvc \
 
 pcl_facade_dirs := Facades
 
-mobile_dirs := \
+mobile_common_dirs := \
        corlib  \
        System  \
        System.Core     \
@@ -153,19 +134,27 @@ mobile_dirs := \
        System.Net \
        System.Windows \
        System.Xml.Serialization \
+       Mono.CSharp     \
+       Microsoft.CSharp \
        $(pcl_facade_dirs)
 
-monodroid_dirs := \
+mobile_static_dirs := \
+       $(mobile_common_dirs)   \
+       Mono.Dynamic.Interpreter
+
+mobile_dynamic_dirs := \
+       $(mobile_common_dirs)   \
        Mono.CompilerServices.SymbolWriter      \
-       Mono.CSharp     \
-       Microsoft.CSharp \
        System.Net.Http
 
 xammac_dirs := \
-       Mono.CompilerServices.SymbolWriter      \
-       Mono.CSharp     \
-       Microsoft.CSharp \
-       System.Net.Http
+       $(mobile_dynamic_dirs)
+
+monodroid_dirs := \
+       $(mobile_dynamic_dirs)
+
+monotouch_dirs := \
+       $(mobile_static_dirs)
 
 monotouch_runtime_dirs := \
        corlib \
@@ -174,12 +163,6 @@ monotouch_runtime_dirs := \
        System.XML \
        Mono.CSharp
 
-monotouch_dirs := \
-       Mono.CSharp     \
-       Microsoft.CSharp \
-       Mono.Dynamic.Interpreter \
-       System.Core
-
 net_4_0_dirs := \
        System.Numerics         \
        Microsoft.CSharp        \
@@ -187,7 +170,6 @@ net_4_0_dirs := \
        System.Xaml \
        WindowsBase \
        System.ServiceModel.Activation \
-       System.ServiceModel \
        System.ServiceModel.Routing \
        System.ServiceModel.Discovery \
        System.Runtime.Caching \
@@ -211,7 +193,7 @@ net_4_0_dirs := \
        System.Data.Services \
        System.Json.Microsoft \
        monodoc
-       
+
 net_4_0_only_dirs := \
        System.ComponentModel.Composition
 
@@ -249,21 +231,21 @@ xbuild_4_0_dirs := \
        $(xbuild_2_0_dirs)      \
        Microsoft.Build
 
-net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
-monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
-monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs)
+net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
+monodroid_SUBDIRS := $(monodroid_dirs)
+monotouch_SUBDIRS := $(monotouch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
-mobile_static_SUBDIRS := $(mobile_dirs)
-mobile_SUBDIRS := $(mobile_dirs)
-xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs)
+mobile_static_SUBDIRS := $(mobile_static_dirs)
+mobile_SUBDIRS := $(mobile_dynamic_dirs)
+xammac_SUBDIRS := $(xammac_dirs)
 net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
-net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
-net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
+net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
+net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
 
@@ -293,7 +275,7 @@ all-local $(STD_TARGETS:=-local):
        @:
 
 # Files needed to bootstrap C# compiler
-basic_files = basic.exe mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll
+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/%)
 
 lib/monolite: