[build] Roslyn switch

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index db4f42754010cc669dda38e99777c5710108d5b0..991e1ea417d517faaaa0800a84533fe910bc4b43 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -1,9 +1,21 @@
 thisdir = class
 
-basic_SUBDIRS := corlib Mono.Security System System.XML System.Core
-
 pcl_facade_dirs := Facades
 
+# The minimal set of csc dependencies
+basic_SUBDIRS := \
+       corlib \
+       Mono.Security \
+       System \
+       System.XML \
+       System.Core \
+       System.ComponentModel.Composition.4.5 \
+       System.Numerics \
+       System.Xml.Linq \
+       Mono.Cecil \
+       $(pcl_facade_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
@@ -15,12 +27,12 @@ build_SUBDIRS :=  \
        System.XML \
        Mono.Posix \
        System.Core \
-       Mono.Cecil \
-       Mono.Cecil.Mdb \
        System.ComponentModel.Composition.4.5 \
        System.Numerics \
        System.Xml.Linq \
-       $(pcl_facade_dirs)
+       Mono.Cecil \
+       $(pcl_facade_dirs) \
+       ../tools/cil-stringreplacer
 
 mobile_common_dirs := \
        corlib  \
@@ -61,7 +73,7 @@ mobile_common_dirs := \
        System.Reflection.Context       \
        System.Net.Http.WinHttpHandler
 
-mobile_static_dirs := \
+aot_only_dirs := \
        $(mobile_common_dirs)   \
        Mono.Dynamic.Interpreter        \
        PEAPI   \
@@ -69,21 +81,28 @@ mobile_static_dirs := \
        Mono.Simd                       \
        $(pcl_facade_dirs)
 
-mobile_dynamic_dirs := \
+aot_hybrid_dirs := \
        $(mobile_common_dirs)   \
+       PEAPI   \
        Mono.CompilerServices.SymbolWriter      \
+       Mono.Simd                       \
        $(pcl_facade_dirs)
 
 xammac_dirs := \
-       $(mobile_dynamic_dirs)
+       $(mobile_common_dirs)   \
+       Mono.CompilerServices.SymbolWriter      \
+       $(pcl_facade_dirs)
 
 monodroid_dirs := \
-       $(mobile_dynamic_dirs)
+       $(mobile_common_dirs)   \
+       Mono.CompilerServices.SymbolWriter      \
+       Mono.Btls.Interface     \
+       $(pcl_facade_dirs)
 
 monotouch_dirs := \
-       $(mobile_static_dirs)
+       $(aot_only_dirs)
 
-monotouch_watch_dirs := $(monotouch_dirs)
+monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
 monotouch_tv_dirs   := $(monotouch_dirs)
 
 monotouch_runtime_dirs := \
@@ -94,7 +113,7 @@ monotouch_runtime_dirs := \
        System.XML \
        Mono.CSharp
 
-monotouch_watch_runtime_dirs := $(monotouch_runtime_dirs)
+monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs))
 monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
 
 xammac_4_5_dirs := \
@@ -236,6 +255,7 @@ net_4_x_dirs := \
 net_4_x_parallel_dirs := \
        PEAPI                           \
        I18N                            \
+       Mono.Btls.Interface             \
        Mono.Http                       \
        Mono.Cairo                      \
        Mono.Cecil                      \
@@ -305,19 +325,19 @@ monotouch_tv_SUBDIRS    := $(monotouch_tv_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs)
 monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs)
-mobile_static_SUBDIRS := $(mobile_static_dirs)
-mobile_SUBDIRS := $(mobile_dynamic_dirs)
+aot_only_SUBDIRS := $(aot_only_dirs)
+aot_hybrid_SUBDIRS := $(aot_hybrid_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
 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
+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
 
 include ../build/rules.make
 
-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)
+SUBDIRS = $(aot_only_dirs) $(aot_hybrid_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) Microsoft.NuGet.Build.Tasks
 
@@ -350,6 +370,8 @@ all-local $(STD_TARGETS:=-local):
 
 all-local-aot:
 
+monolite_dir := monolite
+
 # Files needed to bootstrap C# compiler
 build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \
        System.Numerics.dll System.Xml.Linq.dll \
@@ -361,22 +383,23 @@ build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Co
        Facades/System.IO.dll Facades/System.Runtime.InteropServices.dll Facades/System.Xml.ReaderWriter.dll Facades/System.Linq.Expressions.dll \
        Facades/System.Runtime.Numerics.dll Facades/System.Xml.XDocument.dll
 
-monolite_files = $(build_files:%=lib/monolite/%)
+monolite_files = $(build_files:%=lib/$(monolite_dir)/%)
 
-lib/monolite:
-lib/monolite/Facades:
+lib/$(monolite_dir):
+lib/$(monolite_dir)/Facades:
        $(MKINSTALLDIRS) $@
 
-$(monolite_files): | lib/monolite
-$(monolite_files): | lib/monolite/Facades
-$(monolite_files): lib/monolite/%: lib/build/%
+$(monolite_files): | lib/$(monolite_dir)
+$(monolite_files): | lib/$(monolite_dir)/Facades
+$(monolite_files): lib/$(monolite_dir)/%: lib/build/%
        cp -p $< $@
 
 $(build_files:%=lib/build/%):
        cd $(topdir) && $(MAKE) profile-do--build--all NO_DIR_CHECK=1 SKIP_AOT=1
 
-dist-default: $(monolite_files)
-       cp -p lib/basic/basic.exe lib/monolite
+dist-monolite: $(monolite_files)
+
+dist-default: dist-monolite
 
 dist-local: dist-default