diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2015-03-02 22:03:56 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2015-03-02 22:03:56 +0300 |
| commit | 13685c2326a96543520a4820a378f2fb93cb14d0 (patch) | |
| tree | f801daaf4bfeab17210d6a601b9404407f768b90 /mcs | |
| parent | fa5e78a8d7bfada7141bed5b02b1072736c5614c (diff) | |
[build] Add the assemblies in LIB_REFS to LIB_MCS_FLAGS automatically to reduce duplication.
Diffstat (limited to 'mcs')
162 files changed, 159 insertions, 468 deletions
diff --git a/mcs/build/library.make b/mcs/build/library.make index e2c02afab30..212314fd4a0 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -8,10 +8,18 @@ # All the dep files now land in the same directory so we # munge in the library name to keep the files from clashing. +# The including makefile can set the following variables: +# LIB_MCS_FLAGS - Command line flags passed to mcs. +# LIB_REFS - This should be a space separated list of assembly names which are added to the mcs +# command line. +# + # All dependent libs become dependent dirs for parallel builds # Have to rename to handle differences between assembly/directory names DEP_LIBS=$(patsubst System.Xml,System.XML,$(patsubst System.Windows.Forms,Managed.Windows.Forms,$(LIB_REFS))) +LIB_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS)) + sourcefile = $(LIBRARY).sources # If the directory contains the per profile include file, generate list file. diff --git a/mcs/class/Commons.Xml.Relaxng/Makefile b/mcs/class/Commons.Xml.Relaxng/Makefile index 266909d1864..88e3bfa6986 100644 --- a/mcs/class/Commons.Xml.Relaxng/Makefile +++ b/mcs/class/Commons.Xml.Relaxng/Makefile @@ -8,7 +8,7 @@ OTHER_RES = $(RESOURCE_FILES) LIBRARY = Commons.Xml.Relaxng.dll LIB_REFS = System System.Xml -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \ +LIB_MCS_FLAGS = /r:$(corlib) \ $(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r))) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 EXTRA_DISTFILES = \ diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile index 5a403c2d4c7..9c11dbac65c 100644 --- a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile +++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile @@ -8,7 +8,7 @@ LIBRARY_COMPAT = yes LIBRARY_SNK = SharpZipLib.key LIB_REFS = System System.Xml -LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll +LIB_MCS_FLAGS = -r:$(corlib) NO_TEST = yes EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK) diff --git a/mcs/class/Cscompmgd/Makefile b/mcs/class/Cscompmgd/Makefile index f441316fed4..3afddcca8fa 100644 --- a/mcs/class/Cscompmgd/Makefile +++ b/mcs/class/Cscompmgd/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Cscompmgd.dll LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 LIBRARY_NAME = cscompmgd.dll diff --git a/mcs/class/CustomMarshalers/Makefile b/mcs/class/CustomMarshalers/Makefile index afe94b71fba..0e432dc33b1 100644 --- a/mcs/class/CustomMarshalers/Makefile +++ b/mcs/class/CustomMarshalers/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = CustomMarshalers.dll LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/Facades/System.Collections.Concurrent/Makefile b/mcs/class/Facades/System.Collections.Concurrent/Makefile index ab914f5253f..4eeef250d28 100644 --- a/mcs/class/Facades/System.Collections.Concurrent/Makefile +++ b/mcs/class/Facades/System.Collections.Concurrent/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Collections.Concurrent.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Collections/Makefile b/mcs/class/Facades/System.Collections/Makefile index adc3c372e4f..b0246d2109b 100644 --- a/mcs/class/Facades/System.Collections/Makefile +++ b/mcs/class/Facades/System.Collections/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Collections.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/Makefile b/mcs/class/Facades/System.ComponentModel.Annotations/Makefile index 9784328aed3..221258a23bc 100644 --- a/mcs/class/Facades/System.ComponentModel.Annotations/Makefile +++ b/mcs/class/Facades/System.ComponentModel.Annotations/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ComponentModel.Annotations.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.ComponentModel.DataAnnotations -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ComponentModel.DataAnnotations +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile index 04e3392f1d3..01b7479e77b 100644 --- a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile +++ b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ComponentModel.EventBasedAsync.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ComponentModel/Makefile b/mcs/class/Facades/System.ComponentModel/Makefile index eeb6e308061..54d137ec650 100644 --- a/mcs/class/Facades/System.ComponentModel/Makefile +++ b/mcs/class/Facades/System.ComponentModel/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ComponentModel.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Diagnostics.Debug/Makefile b/mcs/class/Facades/System.Diagnostics.Debug/Makefile index 5b404573c0f..ebbdd46fb9a 100644 --- a/mcs/class/Facades/System.Diagnostics.Debug/Makefile +++ b/mcs/class/Facades/System.Diagnostics.Debug/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Diagnostics.Debug.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Diagnostics.Tools/Makefile b/mcs/class/Facades/System.Diagnostics.Tools/Makefile index 219061c0dd9..e19fe8385a2 100644 --- a/mcs/class/Facades/System.Diagnostics.Tools/Makefile +++ b/mcs/class/Facades/System.Diagnostics.Tools/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Diagnostics.Tools.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Makefile b/mcs/class/Facades/System.Dynamic.Runtime/Makefile index 35d6a3a58d8..c6d2b591d27 100644 --- a/mcs/class/Facades/System.Dynamic.Runtime/Makefile +++ b/mcs/class/Facades/System.Dynamic.Runtime/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Dynamic.Runtime.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.IO/Makefile b/mcs/class/Facades/System.IO/Makefile index 320c330f216..3fb49f7f5eb 100644 --- a/mcs/class/Facades/System.IO/Makefile +++ b/mcs/class/Facades/System.IO/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.IO.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Linq.Expressions/Makefile b/mcs/class/Facades/System.Linq.Expressions/Makefile index d5a64564c82..d262230f5e3 100644 --- a/mcs/class/Facades/System.Linq.Expressions/Makefile +++ b/mcs/class/Facades/System.Linq.Expressions/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Linq.Expressions.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Linq.Parallel/Makefile b/mcs/class/Facades/System.Linq.Parallel/Makefile index 9f6d2040dae..dcaccc2fb06 100644 --- a/mcs/class/Facades/System.Linq.Parallel/Makefile +++ b/mcs/class/Facades/System.Linq.Parallel/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Linq.Parallel.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Linq.Queryable/Makefile b/mcs/class/Facades/System.Linq.Queryable/Makefile index 0464bf4b49b..2521357fdbc 100644 --- a/mcs/class/Facades/System.Linq.Queryable/Makefile +++ b/mcs/class/Facades/System.Linq.Queryable/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Linq.Queryable.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Linq/Makefile b/mcs/class/Facades/System.Linq/Makefile index 1e4a7346bd1..79834e73250 100644 --- a/mcs/class/Facades/System.Linq/Makefile +++ b/mcs/class/Facades/System.Linq/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Linq.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Net.NetworkInformation/Makefile b/mcs/class/Facades/System.Net.NetworkInformation/Makefile index 1feda6e8465..c7a8929db7e 100644 --- a/mcs/class/Facades/System.Net.NetworkInformation/Makefile +++ b/mcs/class/Facades/System.Net.NetworkInformation/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Net.NetworkInformation.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Net.Primitives/Makefile b/mcs/class/Facades/System.Net.Primitives/Makefile index 28b8a409e35..b1574775df1 100644 --- a/mcs/class/Facades/System.Net.Primitives/Makefile +++ b/mcs/class/Facades/System.Net.Primitives/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Net.Primitives.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Net.Requests/Makefile b/mcs/class/Facades/System.Net.Requests/Makefile index 18dd7b53a17..4ea6b004244 100644 --- a/mcs/class/Facades/System.Net.Requests/Makefile +++ b/mcs/class/Facades/System.Net.Requests/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Net.Requests.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ObjectModel/Makefile b/mcs/class/Facades/System.ObjectModel/Makefile index e520e1f9d03..e93b0787f77 100644 --- a/mcs/class/Facades/System.ObjectModel/Makefile +++ b/mcs/class/Facades/System.ObjectModel/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ObjectModel.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.Extensions/Makefile b/mcs/class/Facades/System.Runtime.Extensions/Makefile index d14fd6e4c92..2f14704a551 100644 --- a/mcs/class/Facades/System.Runtime.Extensions/Makefile +++ b/mcs/class/Facades/System.Runtime.Extensions/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.Extensions.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.InteropServices/Makefile b/mcs/class/Facades/System.Runtime.InteropServices/Makefile index 5dd0ef5b7c7..88cda286cd9 100644 --- a/mcs/class/Facades/System.Runtime.InteropServices/Makefile +++ b/mcs/class/Facades/System.Runtime.InteropServices/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.InteropServices.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.Numerics/Makefile b/mcs/class/Facades/System.Runtime.Numerics/Makefile index b132ed2556e..c817782bd71 100644 --- a/mcs/class/Facades/System.Runtime.Numerics/Makefile +++ b/mcs/class/Facades/System.Runtime.Numerics/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.Numerics.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Numerics -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Numerics +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile index a12423d2ed1..eaae8623afd 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile +++ b/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.Serialization.Json.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Runtime.Serialization -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile index f57407c5bb2..678395290f8 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile +++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.Serialization.Primitives.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Runtime.Serialization -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile index ca60386b8c0..3150204d126 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile +++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.Serialization.Xml.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Runtime.Serialization System.Xml -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization /r:System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Runtime/Makefile b/mcs/class/Facades/System.Runtime/Makefile index 472a03ba483..7f29b2de761 100644 --- a/mcs/class/Facades/System.Runtime/Makefile +++ b/mcs/class/Facades/System.Runtime/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Runtime.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.ComponentModel.Composition System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.ComponentModel.Composition /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ServiceModel.Http/Makefile b/mcs/class/Facades/System.ServiceModel.Http/Makefile index 6b96b54e88e..a71717c3473 100644 --- a/mcs/class/Facades/System.ServiceModel.Http/Makefile +++ b/mcs/class/Facades/System.ServiceModel.Http/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ServiceModel.Http.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.ServiceModel -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile index 7831922794f..0827bf94262 100644 --- a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile +++ b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ServiceModel.Primitives.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.ServiceModel System.Xml -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel /r:System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.ServiceModel.Security/Makefile b/mcs/class/Facades/System.ServiceModel.Security/Makefile index a419407aefd..da1752ec0c9 100644 --- a/mcs/class/Facades/System.ServiceModel.Security/Makefile +++ b/mcs/class/Facades/System.ServiceModel.Security/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.ServiceModel.Security.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.ServiceModel -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Makefile b/mcs/class/Facades/System.Text.RegularExpressions/Makefile index 413a998ce93..6e5ce9767b7 100644 --- a/mcs/class/Facades/System.Text.RegularExpressions/Makefile +++ b/mcs/class/Facades/System.Text.RegularExpressions/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Text.RegularExpressions.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Threading.Tasks/Makefile b/mcs/class/Facades/System.Threading.Tasks/Makefile index 92b4e340cf9..824f75b61e2 100644 --- a/mcs/class/Facades/System.Threading.Tasks/Makefile +++ b/mcs/class/Facades/System.Threading.Tasks/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Threading.Tasks.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Threading.Timer/Makefile b/mcs/class/Facades/System.Threading.Timer/Makefile index 06092a05d76..eced1c7eee8 100644 --- a/mcs/class/Facades/System.Threading.Timer/Makefile +++ b/mcs/class/Facades/System.Threading.Timer/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Threading.Timer.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Threading/Makefile b/mcs/class/Facades/System.Threading/Makefile index 6fdd0e2522c..65126553fb3 100644 --- a/mcs/class/Facades/System.Threading/Makefile +++ b/mcs/class/Facades/System.Threading/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Threading.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System System.Core -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/Makefile b/mcs/class/Facades/System.Xml.ReaderWriter/Makefile index 516f1a9e0f7..1b8ed5a4f3c 100644 --- a/mcs/class/Facades/System.Xml.ReaderWriter/Makefile +++ b/mcs/class/Facades/System.Xml.ReaderWriter/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Xml.ReaderWriter.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Xml -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Xml.XDocument/Makefile b/mcs/class/Facades/System.Xml.XDocument/Makefile index a09253862e7..ef476a00c4d 100644 --- a/mcs/class/Facades/System.Xml.XDocument/Makefile +++ b/mcs/class/Facades/System.Xml.XDocument/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Xml.XDocument.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Xml.Linq System.Xml -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml.Linq /r:System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/Makefile b/mcs/class/Facades/System.Xml.XmlSerializer/Makefile index 72c9e6bd19b..69f6f37df00 100644 --- a/mcs/class/Facades/System.Xml.XmlSerializer/Makefile +++ b/mcs/class/Facades/System.Xml.XmlSerializer/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Xml.XmlSerializer.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System.Xml -LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/IBM.Data.DB2/Makefile b/mcs/class/IBM.Data.DB2/Makefile index 762247da8b6..732087d903e 100644 --- a/mcs/class/IBM.Data.DB2/Makefile +++ b/mcs/class/IBM.Data.DB2/Makefile @@ -4,8 +4,7 @@ include ../../build/rules.make LIBRARY = IBM.Data.DB2.dll LIB_REFS = System System.Xml System.Data -LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \ - /r:System.Xml.dll /r:System.Data.dll -warn:1 +LIB_MCS_FLAGS = /unsafe /r:$(corlib) -warn:1 NO_TEST = yes EXTRA_DISTFILES = ibm.pub diff --git a/mcs/class/ICSharpCode.SharpZipLib/Makefile b/mcs/class/ICSharpCode.SharpZipLib/Makefile index b23d04b2628..6a4052c5577 100644 --- a/mcs/class/ICSharpCode.SharpZipLib/Makefile +++ b/mcs/class/ICSharpCode.SharpZipLib/Makefile @@ -6,7 +6,7 @@ LIBRARY = ICSharpCode.SharpZipLib.dll LIBRARY_SNK = SharpZipLib.key LIB_REFS = System System.Xml -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll -warn:1 +LIB_MCS_FLAGS = /r:$(corlib) -warn:1 NO_TEST = yes EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK) diff --git a/mcs/class/Managed.Windows.Forms/Makefile b/mcs/class/Managed.Windows.Forms/Makefile index 268ca1cdef3..de559389219 100644 --- a/mcs/class/Managed.Windows.Forms/Makefile +++ b/mcs/class/Managed.Windows.Forms/Makefile @@ -5,12 +5,7 @@ LIBRARY = System.Windows.Forms.dll LIB_REFS = System System.Xml System.Drawing Accessibility System.Data Mono.Posix Mono.WebBrowser System.Configuration System.Runtime.Serialization.Formatters.Soap LIB_MCS_FLAGS = /unsafe \ - /r:$(corlib) /r:System.dll /r:System.Xml.dll \ - /r:System.Drawing.dll /r:Accessibility.dll \ - /r:System.Data.dll /r:Mono.Posix.dll \ - /r:Mono.WebBrowser \ - /r:System.Configuration.dll \ - /r:System.Runtime.Serialization.Formatters.Soap \ + /r:$(corlib) \ @System.Windows.Forms.dll.resources \ -nowarn:618,612,809 diff --git a/mcs/class/Microsoft.CSharp/Makefile b/mcs/class/Microsoft.CSharp/Makefile index 35c1b117ee0..ae919ca94fb 100644 --- a/mcs/class/Microsoft.CSharp/Makefile +++ b/mcs/class/Microsoft.CSharp/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Microsoft.CSharp.dll LIB_REFS = System.Core Mono.CSharp -LIB_MCS_FLAGS = -r:System.Core.dll -r:Mono.CSharp.dll +LIB_MCS_FLAGS = include ../../build/library.make diff --git a/mcs/class/Microsoft.VisualC/Makefile b/mcs/class/Microsoft.VisualC/Makefile index c454767d4bc..4110234a980 100644 --- a/mcs/class/Microsoft.VisualC/Makefile +++ b/mcs/class/Microsoft.VisualC/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Microsoft.VisualC.dll LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/Microsoft.Web.Infrastructure/Makefile b/mcs/class/Microsoft.Web.Infrastructure/Makefile index 4d5cc6ee11d..d02caf9c02f 100644 --- a/mcs/class/Microsoft.Web.Infrastructure/Makefile +++ b/mcs/class/Microsoft.Web.Infrastructure/Makefile @@ -4,9 +4,7 @@ include ../../build/rules.make LIBRARY = Microsoft.Web.Infrastructure.dll LIB_REFS = System System.Configuration System.Web -LIB_MCS_FLAGS = -r:System.dll \ - -r:System.Configuration.dll \ - -r:System.Web.dll +LIB_MCS_FLAGS = EXTRA_DISTFILES = $(RESOURCE_FILES) diff --git a/mcs/class/Mono.C5/Makefile b/mcs/class/Mono.C5/Makefile index 7f23e3a28db..19363185e86 100644 --- a/mcs/class/Mono.C5/Makefile +++ b/mcs/class/Mono.C5/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.C5.dll LIBRARY_SNK = c5.snk LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169,219,414,1030,3001,3005,3006 +LIB_MCS_FLAGS = /r:$(corlib) -nowarn:169,219,414,1030,3001,3005,3006 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 EXTRA_DISTFILES = \ diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile index f8e26f18ba1..74f8e7ae15e 100644 --- a/mcs/class/Mono.CSharp/Makefile +++ b/mcs/class/Mono.CSharp/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.CSharp.dll LIB_REFS = System.Core System.Xml System -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll +LIB_MCS_FLAGS = MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE)) diff --git a/mcs/class/Mono.Cecil.Mdb/Makefile b/mcs/class/Mono.Cecil.Mdb/Makefile index d81d2f2e1fb..70c759c1dab 100644 --- a/mcs/class/Mono.Cecil.Mdb/Makefile +++ b/mcs/class/Mono.Cecil.Mdb/Makefile @@ -6,7 +6,7 @@ LIBRARY_SNK = ../mono.snk LIBRARY_PACKAGE = none LIB_REFS = System Mono.Cecil -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:Mono.Cecil.dll /d:CECIL -keyfile:$(LIBRARY_SNK) +LIB_MCS_FLAGS = /r:$(corlib) /d:CECIL -keyfile:$(LIBRARY_SNK) NO_TEST = yes NO_INSTALL = yes diff --git a/mcs/class/Mono.Cecil/Makefile b/mcs/class/Mono.Cecil/Makefile index 9fdc8aa3ff0..790a21809ff 100644 --- a/mcs/class/Mono.Cecil/Makefile +++ b/mcs/class/Mono.Cecil/Makefile @@ -6,7 +6,7 @@ LIBRARY_SNK = ../mono.snk LIBRARY_PACKAGE = none LIB_REFS = System.Core -LIB_MCS_FLAGS = /r:$(corlib) -keyfile:$(LIBRARY_SNK) -r:System.Core.dll -d:NET_3_5 +LIB_MCS_FLAGS = /r:$(corlib) -keyfile:$(LIBRARY_SNK) -d:NET_3_5 NO_TEST = yes diff --git a/mcs/class/Mono.CodeContracts/Makefile b/mcs/class/Mono.CodeContracts/Makefile index 3ad95ee52d9..92a7619d104 100644 --- a/mcs/class/Mono.CodeContracts/Makefile +++ b/mcs/class/Mono.CodeContracts/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.CodeContracts.dll LIB_REFS = System System.Core Mono.Cecil Mono.Cecil.Mdb -LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:Mono.Cecil.dll -r:Mono.Cecil.Mdb.dll +LIB_MCS_FLAGS = #-r:Mono.Cecil.Pdb.dll TEST_MCS_FLAGS = -r:System.Core.dll -debug diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile index e43953af85b..467436e7e9d 100644 --- a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile +++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Mono.CompilerServices.SymbolWriter.dll LIB_REFS = System -LIB_MCS_FLAGS = -r:System.dll -lib:$(bare_libdir) +LIB_MCS_FLAGS = -lib:$(bare_libdir) NO_TEST = yes diff --git a/mcs/class/Mono.Data.Sqlite/Makefile b/mcs/class/Mono.Data.Sqlite/Makefile index 5d16891cbe9..6746daf26e6 100644 --- a/mcs/class/Mono.Data.Sqlite/Makefile +++ b/mcs/class/Mono.Data.Sqlite/Makefile @@ -11,7 +11,7 @@ PREBUILT = $(RESX_RESOURCES:=.prebuilt) LIBRARY = Mono.Data.Sqlite.dll LIB_REFS = System System.Data System.Transactions System.Xml -LIB_MCS_FLAGS = /unsafe /r:System.dll /r:System.Data.dll /r:System.Transactions.dll /r:System.Xml.dll \ +LIB_MCS_FLAGS = /unsafe \ $(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 @@ -24,7 +24,7 @@ EXTRA_DISTFILES = Test/SqliteTest.cs \ resources/MetaDataCollections.xml \ $(PREBUILT) \ $(wildcard resources/*.bmp) - + CLEAN_FILES += $(RESX_RESOURCES) CLEAN_FILES = $(RESX_RESOURCES) diff --git a/mcs/class/Mono.Data.Tds/Makefile b/mcs/class/Mono.Data.Tds/Makefile index edecee0089a..4f6cc0ca353 100644 --- a/mcs/class/Mono.Data.Tds/Makefile +++ b/mcs/class/Mono.Data.Tds/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Mono.Data.Tds.dll LIB_REFS = System System.Xml Mono.Security -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll /r:Mono.Security.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = /r:System.dll /r:System.Net.dll diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile index 2000a6f7d60..ef23ec5d568 100644 --- a/mcs/class/Mono.Debugger.Soft/Makefile +++ b/mcs/class/Mono.Debugger.Soft/Makefile @@ -5,7 +5,7 @@ LIBRARY = Mono.Debugger.Soft.dll LIBRARY_SNK = ../mono.snk LIB_REFS = System Mono.Cecil System.Core -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:Mono.Cecil.dll /r:System.Core.dll /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS -keyfile:$(LIBRARY_SNK) +LIB_MCS_FLAGS = /r:$(corlib) /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS -keyfile:$(LIBRARY_SNK) TEST_MCS_FLAGS = /r:Mono.Cecil.dll /r:System.dll /r:System.Core.dll diff --git a/mcs/class/Mono.Directory.LDAP/Makefile b/mcs/class/Mono.Directory.LDAP/Makefile index 11778c6e815..919f24f0d62 100644 --- a/mcs/class/Mono.Directory.LDAP/Makefile +++ b/mcs/class/Mono.Directory.LDAP/Makefile @@ -4,6 +4,6 @@ include ../../build/rules.make LIBRARY = Mono.Directory.LDAP.dll LIB_REFS = System System.Data -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Data.dll +LIB_MCS_FLAGS = /r:$(corlib) include ../../build/library.make diff --git a/mcs/class/Mono.Dynamic.Interpreter/Makefile b/mcs/class/Mono.Dynamic.Interpreter/Makefile index 5145db8b80c..a8cdba45d46 100644 --- a/mcs/class/Mono.Dynamic.Interpreter/Makefile +++ b/mcs/class/Mono.Dynamic.Interpreter/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.Dynamic.Interpreter.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll \ +LIB_MCS_FLAGS = \ -d:FEATURE_CORE_DLR,FEATURE_DBNULL,FEATURE_DEFAULT_PARAMETER_VALUE,FEATURE_GET_TYPE_INFO,FEATURE_VARIANCE,FEATURE_SERIALIZATION,CLR45 \ -d:MONO_INTERPRETER \ -delaysign -keyfile:../mono.pub diff --git a/mcs/class/Mono.Http/Makefile b/mcs/class/Mono.Http/Makefile index d97ba72dc49..d52144b2154 100644 --- a/mcs/class/Mono.Http/Makefile +++ b/mcs/class/Mono.Http/Makefile @@ -5,11 +5,6 @@ include ../../build/rules.make LIBRARY = Mono.Http.dll LIB_REFS = System System.Xml System.Web ICSharpCode.SharpZipLib Mono.Security LIB_MCS_FLAGS = -r:$(corlib) \ - -r:System.dll \ - -r:System.Xml.dll \ - -r:System.Web.dll \ - -r:ICSharpCode.SharpZipLib.dll \ - -r:Mono.Security.dll \ -nowarn:618 NO_TEST = yes diff --git a/mcs/class/Mono.Management/Makefile b/mcs/class/Mono.Management/Makefile index 47e3baaa500..c4a97a86a89 100644 --- a/mcs/class/Mono.Management/Makefile +++ b/mcs/class/Mono.Management/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.Management.dll LIB_REFS = System Mono.Posix -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:Mono.Posix.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Makefile b/mcs/class/Mono.Messaging.RabbitMQ/Makefile index b655ea8c9f6..d07fee59e7e 100644 --- a/mcs/class/Mono.Messaging.RabbitMQ/Makefile +++ b/mcs/class/Mono.Messaging.RabbitMQ/Makefile @@ -4,11 +4,7 @@ include ../../build/rules.make LIBRARY = Mono.Messaging.RabbitMQ.dll LIB_REFS = System System.Messaging Mono.Messaging RabbitMQ.Client -LIB_MCS_FLAGS = /r:System.dll \ - /r:System.Messaging.dll \ - /r:Mono.Messaging.dll \ - /r:RabbitMQ.Client \ - -nowarn:618 +LIB_MCS_FLAGS = -nowarn:618 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 \ /r:nunit.mocks.dll diff --git a/mcs/class/Mono.Messaging/Makefile b/mcs/class/Mono.Messaging/Makefile index 0733da95dbf..a2e3fbf7b44 100644 --- a/mcs/class/Mono.Messaging/Makefile +++ b/mcs/class/Mono.Messaging/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.Messaging.dll LIB_REFS = System System.Configuration -LIB_MCS_FLAGS = /r:System.dll /r:System.Configuration +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 /r:System.Messaging.dll /r:nunit.mocks.dll diff --git a/mcs/class/Mono.Options/Makefile b/mcs/class/Mono.Options/Makefile index 322457e313a..beee719c77f 100644 --- a/mcs/class/Mono.Options/Makefile +++ b/mcs/class/Mono.Options/Makefile @@ -8,7 +8,7 @@ LIBRARY_PACKAGE = none NO_INSTALL = yes LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = /r:Mono.Posix.dll /r:System.dll /r:System.Core.dll mono_sourcelibs_DIR = $(DESTDIR)$(mono_libdir)/mono-source-libs diff --git a/mcs/class/Mono.Parallel/Makefile b/mcs/class/Mono.Parallel/Makefile index 6223ac9c79f..e2f587ed5e6 100644 --- a/mcs/class/Mono.Parallel/Makefile +++ b/mcs/class/Mono.Parallel/Makefile @@ -9,4 +9,4 @@ include ../../build/library.make TEST_MCS_FLAGS = /r:System.Core.dll LIB_REFS += System.Core System -LIB_MCS_FLAGS += -d:INSIDE_MONO_PARALLEL -r:$(corlib) -r:System.Core.dll -r:System.dll +LIB_MCS_FLAGS += -d:INSIDE_MONO_PARALLEL -r:$(corlib) diff --git a/mcs/class/Mono.Posix/Makefile b/mcs/class/Mono.Posix/Makefile index 9b14c97cc3d..fa0f5180187 100644 --- a/mcs/class/Mono.Posix/Makefile +++ b/mcs/class/Mono.Posix/Makefile @@ -6,7 +6,7 @@ LIBRARY = Mono.Posix.dll # Don't warn about [Obsolete] members, as there are now *lots* of [Obsolete] # members, generating volumes of output. LIB_REFS = System -LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:0618,612 +LIB_MCS_FLAGS = /unsafe /r:$(corlib) /nowarn:0618,612 TEST_MCS_FLAGS = /r:Mono.Posix.dll /r:System.dll /nowarn:0219,0618 LIBRARY_COMPILE = $(BOOT_COMPILE) diff --git a/mcs/class/Mono.Reactive.Testing/Makefile b/mcs/class/Mono.Reactive.Testing/Makefile index 40c183b3654..0708f3df124 100644 --- a/mcs/class/Mono.Reactive.Testing/Makefile +++ b/mcs/class/Mono.Reactive.Testing/Makefile @@ -6,21 +6,6 @@ LIBRARY = Mono.Reactive.Testing.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.PlatformServices System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Experimental System.Reactive.Windows.Forms System.Reactive.Windows.Threading System.Reactive.Observable.Aliases System.Windows.Forms WindowsBase nunit.framework LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll \ - -r:System.Reactive.PlatformServices.dll \ - -r:System.Reactive.Providers.dll \ - -r:System.Reactive.Runtime.Remoting.dll \ - -r:System.Reactive.Experimental.dll \ - -r:System.Reactive.Windows.Forms.dll \ - -r:System.Reactive.Windows.Threading.dll \ - -r:System.Reactive.Observable.Aliases.dll \ - -r:System.Windows.Forms.dll \ - -r:WindowsBase.dll \ - -r:nunit.framework.dll \ -d:NUNIT -d:MONO -d:DESKTOPCLR # NO_PERF is required to disable ObservableMultipleTest.Catch_TailRecursive2 which blocked test execution. # disabled -d:HAS_WINFORMS diff --git a/mcs/class/Mono.Security/Makefile b/mcs/class/Mono.Security/Makefile index 1d25ef67b62..edb34ec36bf 100644 --- a/mcs/class/Mono.Security/Makefile +++ b/mcs/class/Mono.Security/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = Mono.Security.dll LOCAL_MCS_FLAGS = -lib:$(the_libdir_base)bare LIB_REFS = System -LIB_MCS_FLAGS = -r:System.dll -unsafe -nowarn:1030 +LIB_MCS_FLAGS = -unsafe -nowarn:1030 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,618,672 include ../../build/library.make diff --git a/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile b/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile index 3930805dd3b..42f1432b07b 100644 --- a/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile +++ b/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile @@ -10,18 +10,6 @@ LIB_REFS = System System.Xml System.Configuration System.Security System.Transac LIB_MCS_FLAGS = \ /nowarn:414,169,67,3005,436 \ /unsafe \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Configuration.dll \ - /r:../lib/net_3_0/System.Runtime.Serialization.dll \ - /r:System.Security.dll \ - /r:../lib/net_3_0/System.IdentityModel.dll \ - /r:../lib/net_3_0/System.IdentityModel.Selectors.dll \ - /r:../lib/net_3_0/System.ServiceModel.dll \ - /r:System.Transactions.dll \ - /r:System.Web.dll \ - /r:System.Web.Services.dll \ - /r:Mono.Security.dll \ $(RESOURCE_FILES:%=/resource:%) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/Mono.Simd/Makefile b/mcs/class/Mono.Simd/Makefile index 97ec88b88e8..17b2df2aabb 100644 --- a/mcs/class/Mono.Simd/Makefile +++ b/mcs/class/Mono.Simd/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Mono.Simd.dll LIB_REFS = System.Core -LIB_MCS_FLAGS = -r:$(corlib) -r:System.Core.dll /unsafe +LIB_MCS_FLAGS = -r:$(corlib) /unsafe TEST_MCS_FLAGS = -r:Mono.Simd.dll NO_TEST = yes diff --git a/mcs/class/Mono.WebBrowser/Makefile b/mcs/class/Mono.WebBrowser/Makefile index 51fbe4015f4..d632681cdb0 100644 --- a/mcs/class/Mono.WebBrowser/Makefile +++ b/mcs/class/Mono.WebBrowser/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = Mono.WebBrowser.dll LIB_REFS = System -LIB_MCS_FLAGS = -r:System.dll -warn:1 +LIB_MCS_FLAGS = -warn:1 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/Mono.Xml.Ext/Makefile b/mcs/class/Mono.Xml.Ext/Makefile index eaeb4864cd3..32b46e6664a 100644 --- a/mcs/class/Mono.Xml.Ext/Makefile +++ b/mcs/class/Mono.Xml.Ext/Makefile @@ -11,7 +11,7 @@ SCARY_LIB=/lib:$(prefix)/lib endif LIB_REFS = System System.Xml -LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib) /r:System.dll /r:System.Xml.dll +LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = \ diff --git a/mcs/class/PEAPI/Makefile b/mcs/class/PEAPI/Makefile index e76a04a9c61..e699f77f53f 100644 --- a/mcs/class/PEAPI/Makefile +++ b/mcs/class/PEAPI/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = PEAPI.dll LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:414,618 +LIB_MCS_FLAGS = /r:$(corlib) -nowarn:414,618 NO_TEST = yes EXTRA_DISTFILES = README.txt diff --git a/mcs/class/RabbitMQ.Client/src/client/Makefile b/mcs/class/RabbitMQ.Client/src/client/Makefile index 29a524c367d..1e4a1ab337b 100644 --- a/mcs/class/RabbitMQ.Client/src/client/Makefile +++ b/mcs/class/RabbitMQ.Client/src/client/Makefile @@ -4,7 +4,7 @@ include ../../../../build/rules.make LIBRARY = RabbitMQ.Client.dll LIB_REFS = System System.Xml -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -nowarn:618 +LIB_MCS_FLAGS = -nowarn:618 NO_TEST = yes include ../../../../build/library.make diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile index be041802cc2..b5f9682cc3f 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile +++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.ComponentModel.Composition.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -d:CLR40 -resource:$(STRING_MESSAGES) -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414 +LIB_MCS_FLAGS = -d:CLR40 -resource:$(STRING_MESSAGES) -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414 STRING_MESSAGES = Microsoft.Internal.Strings.resources diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile index 7790ae9227a..b5246288183 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile +++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile @@ -4,11 +4,7 @@ include ../../build/rules.make LIBRARY = System.ComponentModel.DataAnnotations.dll LIB_REFS = System System.Core System.Data System.Xml -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Data.dll \ - /r:System.Xml.dll \ +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Configuration.Install/Makefile b/mcs/class/System.Configuration.Install/Makefile index 2d73f249aa7..2da44f09fe5 100644 --- a/mcs/class/System.Configuration.Install/Makefile +++ b/mcs/class/System.Configuration.Install/Makefile @@ -3,7 +3,7 @@ include ../../build/rules.make LIBRARY = System.Configuration.Install.dll LIB_REFS = System System.Xml -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile index dc0ce2c413d..43fc4253383 100644 --- a/mcs/class/System.Configuration/Makefile +++ b/mcs/class/System.Configuration/Makefile @@ -8,7 +8,7 @@ LIBRARY = System.Configuration.dll LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir) test_remove = $(LOCAL_MCS_FLAGS) LIB_REFS = System System.Xml System.Security -LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll -nowarn:618 +LIB_MCS_FLAGS = -r:$(corlib) -nowarn:618 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) include ../../build/library.make diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile index ed653e08ed5..12226e3d2e9 100644 --- a/mcs/class/System.Core/Makefile +++ b/mcs/class/System.Core/Makefile @@ -6,7 +6,7 @@ LIBRARY = System.Core.dll REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,PFX_LEGACY_3_5,FEATURE_NETCORE LIB_REFS = System -LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) -d:INSIDE_SYSCORE -d:LIBC /r:System.dll -unsafe +LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) -d:INSIDE_SYSCORE -d:LIBC -unsafe RESOURCE_STRINGS = ../../../external/referencesource/System.Core/System.Core.txt ifneq (2.1, $(FRAMEWORK_VERSION)) @@ -29,7 +29,7 @@ LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR ifneq (plaincore/,$(intermediate)) LIB_REFS += Mono.Dynamic.Interpreter -LIB_MCS_FLAGS += -d:MONO_INTERPRETER -r:Mono.Dynamic.Interpreter.dll +LIB_MCS_FLAGS += -d:MONO_INTERPRETER endif endif @@ -48,7 +48,6 @@ endif ifdef CLR_PROFILE LIB_REFS += Mono.Posix -LIB_MCS_FLAGS += -r:Mono.Posix.dll endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Data.DataSetExtensions/Makefile b/mcs/class/System.Data.DataSetExtensions/Makefile index 4a538d5ef25..48c293f8650 100644 --- a/mcs/class/System.Data.DataSetExtensions/Makefile +++ b/mcs/class/System.Data.DataSetExtensions/Makefile @@ -7,12 +7,10 @@ LIBRARY = System.Data.DataSetExtensions.dll LIB_REFS = System.Core System System.Data System.Xml System.Web LIB_MCS_FLAGS = \ -r:$(corlib) \ - -r:System.Core.dll \ - -r:System.dll \ -r:System.Data.dll \ -r:System.Xml.dll \ -r:System.Web.dll \ - $(OTHER_LIB_MCS_FLAGS) + $(OTHER_LIB_MCS_FLAGS) ifeq (2.0, $(FRAMEWORK_VERSION)) # This is a .NET 3.5 only assembly, but built during the 2.0 build diff --git a/mcs/class/System.Data.Entity/Makefile b/mcs/class/System.Data.Entity/Makefile index 886cc56123b..d1637f1bee4 100644 --- a/mcs/class/System.Data.Entity/Makefile +++ b/mcs/class/System.Data.Entity/Makefile @@ -4,9 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.Entity.dll LIB_REFS = System System.Core System.Data System.Xml System.Xml.Linq System.Transactions System.Runtime.Serialization System.ComponentModel.DataAnnotations System.Configuration -LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:System.Data.dll -r:System.Xml.dll -r:System.Xml.Linq.dll -r:System.Transactions.dll \ - -r:System.Runtime.Serialization.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll \ - -warn:2 +LIB_MCS_FLAGS = -warn:2 RESOURCE_STRINGS = ../../../external/referencesource/System.Data.Entity/System.Data.Entity.txt diff --git a/mcs/class/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/Makefile index 22a29eb482e..ee325f1dc96 100644 --- a/mcs/class/System.Data.Linq/Makefile +++ b/mcs/class/System.Data.Linq/Makefile @@ -5,11 +5,6 @@ include ../../build/rules.make LIBRARY = System.Data.Linq.dll LIB_REFS = System System.Core System.Xml System.Data System.Runtime.Serialization LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Xml.dll \ - /r:System.Data.dll \ - /r:System.Runtime.Serialization.dll \ /resource:./src/DbLinq/Schema/Dbml/DbmlSchema.xsd,DbLinq.Schema.Dbml.DbmlSchema.xsd \ /d:MONO_STRICT /d:MONO_DEPLOY -warn:1 diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile index 966905d59f3..befed69def8 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile +++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile @@ -4,12 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.Linq.dll LIB_REFS = System System.Core System.Data System.Transactions System.Xml -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Data.dll \ - /r:System.Transactions.dll \ - /r:System.Xml.dll \ +LIB_MCS_FLAGS = NO_TEST = yes diff --git a/mcs/class/System.Data.OracleClient/Makefile b/mcs/class/System.Data.OracleClient/Makefile index 4a507b890b7..a4415a382bd 100644 --- a/mcs/class/System.Data.OracleClient/Makefile +++ b/mcs/class/System.Data.OracleClient/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.OracleClient.dll LIB_REFS = System System.Xml System.Data System.EnterpriseServices System.Drawing -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll \ - /r:System.Xml.dll /r:System.Data.dll \ - /r:System.EnterpriseServices.dll \ - /r:System.Drawing.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 diff --git a/mcs/class/System.Data.Services.Client/Makefile b/mcs/class/System.Data.Services.Client/Makefile index e6d5d0e3139..267835e819e 100644 --- a/mcs/class/System.Data.Services.Client/Makefile +++ b/mcs/class/System.Data.Services.Client/Makefile @@ -10,17 +10,11 @@ Client/System.Data.Services.Client.resources: Client/System.Data.Services.Client LIB_REFS = System System.Core System.Xml.Linq System.Data System.Xml LIB_MCS_FLAGS = \ -d:NET_3_5 \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Xml.Linq.dll \ - -r:System.Data.dll \ - -r:System.Xml.dll \ -resource:Client/System.Data.Services.Client.resources \ -warn:2 ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += WindowsBase -LIB_MCS_FLAGS += -r:WindowsBase endif include ../../build/library.make diff --git a/mcs/class/System.Data.Services/Makefile b/mcs/class/System.Data.Services/Makefile index 7e73274ccba..5f9aeccafce 100644 --- a/mcs/class/System.Data.Services/Makefile +++ b/mcs/class/System.Data.Services/Makefile @@ -5,17 +5,10 @@ include ../../build/rules.make LIBRARY = System.Data.Services.dll LIB_REFS = System System.Core System.ServiceModel System.ServiceModel.Web System.Data.Services.Client -LIB_MCS_FLAGS = \ - -d:NET_3_5 \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.ServiceModel.dll \ - -r:System.ServiceModel.Web.dll \ - -r:System.Data.Services.Client.dll +LIB_MCS_FLAGS = -d:NET_3_5 ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += System.ServiceModel.Activation -LIB_MCS_FLAGS += -r:System.ServiceModel.Activation.dll endif TEST_MCS_FLAGS = -r:System.ServiceModel.dll -r:System.Core.dll diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index 4cb82107b7b..568d20a2aaa 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -7,24 +7,13 @@ LIBRARY = System.Data.dll LIB_REFS = System System.Xml System.Core LIB_MCS_FLAGS = \ -nowarn:649 \ - -unsafe \ - -r:System \ - -r:System.Xml.dll \ - -r:System.Core.dll + -unsafe MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE)) ifdef MOBILE LIB_REFS += Mono.Data.Tds System.Transactions -LIB_MCS_FLAGS += \ - -r:Mono.Data.Tds.dll \ - -r:System.Transactions.dll else LIB_REFS += System.EnterpriseServices Mono.Data.Tds System.Configuration System.Transactions -LIB_MCS_FLAGS += \ - -r:System.EnterpriseServices.dll \ - -r:Mono.Data.Tds.dll \ - -r:System.Configuration.dll \ - -r:System.Transactions.dll endif RESOURCE_STRINGS = ../../../external/referencesource/System.Data/system.data.txt diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile index c4683c71e83..be9529a32b1 100644 --- a/mcs/class/System.Design/Makefile +++ b/mcs/class/System.Design/Makefile @@ -6,10 +6,7 @@ LIBRARY = System.Design.dll LIB_REFS = System System.Xml System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration -LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Web.dll \ - -r:System.Windows.Forms.dll -r:System.Drawing.dll \ - -r:Accessibility.dll -r:System.Data.dll \ - -r:System.Configuration.dll +LIB_MCS_FLAGS = -r:$(corlib) TEST_MCS_FLAGS = /r:System.dll -r:System.Drawing.dll -r:System.Windows.Forms diff --git a/mcs/class/System.DirectoryServices.Protocols/Makefile b/mcs/class/System.DirectoryServices.Protocols/Makefile index 1e703362ea7..693e1b273fd 100644 --- a/mcs/class/System.DirectoryServices.Protocols/Makefile +++ b/mcs/class/System.DirectoryServices.Protocols/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.DirectoryServices.Protocols.dll LIB_REFS = System System.DirectoryServices System.Xml -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.DirectoryServices.dll \ - /r:System.Xml.dll \ +LIB_MCS_FLAGS = NO_TEST = yes diff --git a/mcs/class/System.DirectoryServices/Makefile b/mcs/class/System.DirectoryServices/Makefile index 6f12b5f0f89..ff5403fd06a 100644 --- a/mcs/class/System.DirectoryServices/Makefile +++ b/mcs/class/System.DirectoryServices/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.DirectoryServices.dll LIB_REFS = System Novell.Directory.Ldap -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:Novell.Directory.Ldap.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 include ../../build/library.make diff --git a/mcs/class/System.Drawing.Design/Makefile b/mcs/class/System.Drawing.Design/Makefile index cadb3892f10..9fa2fea63b5 100644 --- a/mcs/class/System.Drawing.Design/Makefile +++ b/mcs/class/System.Drawing.Design/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Drawing.Design.dll LIB_REFS = System System.Drawing System.Windows.Forms -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Drawing.dll /r:System.Windows.Forms.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile index fd8581ba2cf..f60e6deafca 100644 --- a/mcs/class/System.Drawing/Makefile +++ b/mcs/class/System.Drawing/Makefile @@ -5,7 +5,7 @@ SUBDIRS = LIBRARY = System.Drawing.dll LIB_REFS = System -LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \ +LIB_MCS_FLAGS = /unsafe /r:$(corlib) \ -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \ -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \ -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico diff --git a/mcs/class/System.Dynamic/Makefile b/mcs/class/System.Dynamic/Makefile index 19de3569d00..5956e751d0c 100644 --- a/mcs/class/System.Dynamic/Makefile +++ b/mcs/class/System.Dynamic/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = System.Dynamic.dll LIB_REFS = System.Core System -LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -r:System.Core.dll -r:System.dll -nowarn:414,169 +LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -nowarn:414,169 # This is a .NET 4.0+ only assembly VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR)) diff --git a/mcs/class/System.EnterpriseServices/Makefile b/mcs/class/System.EnterpriseServices/Makefile index 9a9115f2cd7..16a03ec702a 100644 --- a/mcs/class/System.EnterpriseServices/Makefile +++ b/mcs/class/System.EnterpriseServices/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.EnterpriseServices.dll LIB_REFS = System.Transactions -LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib) /r:System.Transactions.dll +LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib) NO_TEST = yes EXTRA_DISTFILES = System.EnterpriseServices.Internal/ChangeLog diff --git a/mcs/class/System.IO.Compression.FileSystem/Makefile b/mcs/class/System.IO.Compression.FileSystem/Makefile index 375429dcd54..d8b918ebce3 100644 --- a/mcs/class/System.IO.Compression.FileSystem/Makefile +++ b/mcs/class/System.IO.Compression.FileSystem/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.IO.Compression.FileSystem.dll LIB_REFS = System System.IO.Compression -LIB_MCS_FLAGS = /r:System /r:System.IO.Compression.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = /r:System /r:System.Core /r:System.IO.Compression.dll include ../../build/library.make diff --git a/mcs/class/System.IO.Compression/Makefile b/mcs/class/System.IO.Compression/Makefile index 0116c7fc36b..7b2bd8144fb 100644 --- a/mcs/class/System.IO.Compression/Makefile +++ b/mcs/class/System.IO.Compression/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.IO.Compression.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = /r:System /r:System.Core /unsafe +LIB_MCS_FLAGS = /unsafe TEST_MCS_FLAGS = /r:System /r:System.Core include ../../build/library.make diff --git a/mcs/class/System.IdentityModel.Selectors/Makefile b/mcs/class/System.IdentityModel.Selectors/Makefile index e2e719e3c49..de65914ecf0 100644 --- a/mcs/class/System.IdentityModel.Selectors/Makefile +++ b/mcs/class/System.IdentityModel.Selectors/Makefile @@ -4,13 +4,7 @@ include ../../build/rules.make LIBRARY = System.IdentityModel.Selectors.dll LIB_REFS = System System.Xml System.Security System.Runtime.Serialization System.IdentityModel -LIB_MCS_FLAGS = \ - /d:NET_3_0 \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Security.dll \ - /r:System.Runtime.Serialization.dll \ - /r:System.IdentityModel.dll +LIB_MCS_FLAGS = /d:NET_3_0 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.IdentityModel/Makefile b/mcs/class/System.IdentityModel/Makefile index 68b5400a66b..2bafd5b2186 100644 --- a/mcs/class/System.IdentityModel/Makefile +++ b/mcs/class/System.IdentityModel/Makefile @@ -10,13 +10,6 @@ LIBRARY = System.IdentityModel.dll LIB_REFS = System System.Xml System.Security System.Web System.Configuration Mono.Security System.Runtime.Serialization LIB_MCS_FLAGS = \ /d:NET_3_0 \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Security.dll \ - /r:System.Web.dll \ - /r:System.Configuration.dll \ - /r:Mono.Security.dll \ - /r:System.Runtime.Serialization.dll \ $(OTHER_LIB_MCS_FLAGS) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Interactive.Async/Makefile b/mcs/class/System.Interactive.Async/Makefile index bdc32f84dc2..8fa6632c72a 100644 --- a/mcs/class/System.Interactive.Async/Makefile +++ b/mcs/class/System.Interactive.Async/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Interactive.Async.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Interactive.Providers/Makefile b/mcs/class/System.Interactive.Providers/Makefile index f5ebc8fa456..a6381f50d89 100644 --- a/mcs/class/System.Interactive.Providers/Makefile +++ b/mcs/class/System.Interactive.Providers/Makefile @@ -4,11 +4,7 @@ include ../../build/rules.make LIBRARY = System.Interactive.Providers.dll LIB_REFS = System System.Core System.Interactive -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Interactive.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Interactive/Makefile b/mcs/class/System.Interactive/Makefile index ef90933b548..b28f3b343df 100644 --- a/mcs/class/System.Interactive/Makefile +++ b/mcs/class/System.Interactive/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Interactive.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile index beb147c9913..b313957a2c3 100644 --- a/mcs/class/System.Json.Microsoft/Makefile +++ b/mcs/class/System.Json.Microsoft/Makefile @@ -8,17 +8,13 @@ System.Json.Properties.Resources.resources: System.Json/Properties/Resources.res LIBRARY = System.Json.Microsoft.dll LIB_REFS = System System.Xml System.Core System.Runtime.Serialization LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Core.dll \ - /r:System.Runtime.Serialization.dll \ /resource:System.Json.Properties.Resources.resources EXTRA_DISTFILES = System.Json/Properties/Resources.resx ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += Microsoft.CSharp -LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll -d:FEATURE_DYNAMIC +LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC endif ifeq (monodroid, $(PROFILE)) diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile index b48c8c8af6e..f16983c58cb 100644 --- a/mcs/class/System.Json/Makefile +++ b/mcs/class/System.Json/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Json.dll LIB_REFS = System System.Xml System.Core -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Core.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Management/Makefile b/mcs/class/System.Management/Makefile index 9b36bfce61c..4fe9d03dca2 100644 --- a/mcs/class/System.Management/Makefile +++ b/mcs/class/System.Management/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Management.dll LIB_REFS = System System.Configuration.Install -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Configuration.Install.dll +LIB_MCS_FLAGS = /r:$(corlib) NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Messaging/Makefile b/mcs/class/System.Messaging/Makefile index 9be6d608101..6a4b96a572d 100644 --- a/mcs/class/System.Messaging/Makefile +++ b/mcs/class/System.Messaging/Makefile @@ -4,13 +4,7 @@ include ../../build/rules.make LIBRARY = System.Messaging.dll LIB_REFS = System System.Configuration.Install System.Drawing System.Windows.Forms System.Xml Mono.Messaging -LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx \ - /r:System.dll \ - /r:System.Configuration.Install.dll \ - /r:System.Drawing.dll \ - /r:System.Windows.Forms.dll \ - /r:System.Xml \ - /r:Mono.Messaging.dll +LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 \ /r:nunit.mocks.dll diff --git a/mcs/class/System.Net.Http.Formatting/Makefile b/mcs/class/System.Net.Http.Formatting/Makefile index 1bf221cb5d5..e6bee285bd1 100644 --- a/mcs/class/System.Net.Http.Formatting/Makefile +++ b/mcs/class/System.Net.Http.Formatting/Makefile @@ -4,15 +4,14 @@ include ../../build/rules.make LIBRARY = System.Net.Http.Formatting.dll - System.Net.Http.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx $(RESGEN) "$<" "$@" - + System.Net.Http.Properties.Resources.resources: ../../../external/aspnetwebstack/src/System.Net.Http.Formatting/Properties/Resources.resx $(RESGEN) "$<" "$@" LIB_REFS = System.Core System System.Net.Http System.Xml System.Runtime.Serialization System.Xml.Linq System.Data System.Configuration -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Net.Http.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.Xml.Linq.dll -r:System.Data.dll -r:System.Configuration.dll \ +LIB_MCS_FLAGS = \ -d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ -resource:System.Net.Http.Properties.CommonWebApiResources.resources \ -resource:System.Net.Http.Properties.Resources.resources diff --git a/mcs/class/System.Net.Http.WebRequest/Makefile b/mcs/class/System.Net.Http.WebRequest/Makefile index 5bf50782752..fad726ff5f3 100644 --- a/mcs/class/System.Net.Http.WebRequest/Makefile +++ b/mcs/class/System.Net.Http.WebRequest/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = System.Net.Http.WebRequest.dll LIB_REFS = System.Net.Http System -LIB_MCS_FLAGS = -r:System.Net.Http.dll -r:System.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = -r:System.Net.Http.dll diff --git a/mcs/class/System.Net.Http/Makefile b/mcs/class/System.Net.Http/Makefile index 910b45e42fa..aa3cdf921e5 100644 --- a/mcs/class/System.Net.Http/Makefile +++ b/mcs/class/System.Net.Http/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = System.Net.Http.dll LIB_REFS = System.Core System -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll $(EXTRA_LIB_MCS_FLAGS) +LIB_MCS_FLAGS = $(EXTRA_LIB_MCS_FLAGS) TEST_MCS_FLAGS = -r:System.dll -r:System.Core.dll diff --git a/mcs/class/System.Net/Makefile b/mcs/class/System.Net/Makefile index a8bc4601e0c..d3fb591adbe 100644 --- a/mcs/class/System.Net/Makefile +++ b/mcs/class/System.Net/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Net.dll LIB_REFS = System System.Core System.Xml -LIB_MCS_FLAGS = -unsafe -r:System.dll -r:System.Core.dll -r:System.Xml.dll +LIB_MCS_FLAGS = -unsafe ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720 diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile index e456d5fb35d..2b3d458da81 100644 --- a/mcs/class/System.Numerics/Makefile +++ b/mcs/class/System.Numerics/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Numerics.dll LIB_REFS = System -LIB_MCS_FLAGS = -r:System.dll /unsafe -d:MONO +LIB_MCS_FLAGS = /unsafe -d:MONO TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) RESOURCE_STRINGS = ../../../external/referencesource/System.Numerics/System.Numerics.txt diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile index b4704229632..2928707e8ca 100644 --- a/mcs/class/System.Reactive.Core/Makefile +++ b/mcs/class/System.Reactive.Core/Makefile @@ -6,8 +6,6 @@ LIBRARY = System.Reactive.Core.dll LIB_REFS = System System.Core System.Reactive.Interfaces LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ -r:System.Reactive.Interfaces.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Reactive.Debugger/Makefile b/mcs/class/System.Reactive.Debugger/Makefile index b129ec2dc7b..2d4bc4fcc72 100644 --- a/mcs/class/System.Reactive.Debugger/Makefile +++ b/mcs/class/System.Reactive.Debugger/Makefile @@ -4,13 +4,7 @@ include ../../build/rules.make LIBRARY = System.Reactive.Debugger.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Reactive.Experimental/Makefile b/mcs/class/System.Reactive.Experimental/Makefile index 45e2623ffe7..2d66a6010b8 100644 --- a/mcs/class/System.Reactive.Experimental/Makefile +++ b/mcs/class/System.Reactive.Experimental/Makefile @@ -4,13 +4,7 @@ include ../../build/rules.make LIBRARY = System.Reactive.Experimental.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Reactive.Interfaces/Makefile b/mcs/class/System.Reactive.Interfaces/Makefile index 826d14359e1..5962757a17f 100644 --- a/mcs/class/System.Reactive.Interfaces/Makefile +++ b/mcs/class/System.Reactive.Interfaces/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Reactive.Interfaces.dll LIB_REFS = System System.Core -LIB_MCS_FLAGS = \ - @more_build_args \ - -r:System.dll \ - -r:System.Core.dll +LIB_MCS_FLAGS = @more_build_args ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index d1725666f80..480a20543f2 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -6,9 +6,6 @@ LIBRARY = System.Reactive.Linq.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ -r:System.Reactive.Core.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Reactive.Observable.Aliases/Makefile b/mcs/class/System.Reactive.Observable.Aliases/Makefile index 8d3eec4c1df..3a84f3d9518 100644 --- a/mcs/class/System.Reactive.Observable.Aliases/Makefile +++ b/mcs/class/System.Reactive.Observable.Aliases/Makefile @@ -6,11 +6,6 @@ LIBRARY = System.Reactive.Observable.Aliases.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.Providers LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll \ -r:System.Reactive.Providers.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Reactive.PlatformServices/Makefile b/mcs/class/System.Reactive.PlatformServices/Makefile index 2e382ff7b17..9192c21468a 100644 --- a/mcs/class/System.Reactive.PlatformServices/Makefile +++ b/mcs/class/System.Reactive.PlatformServices/Makefile @@ -6,10 +6,6 @@ LIBRARY = System.Reactive.PlatformServices.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ -r:System.Reactive.Linq.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Reactive.Providers/Makefile b/mcs/class/System.Reactive.Providers/Makefile index f8fd62bf4d6..d3badf67382 100644 --- a/mcs/class/System.Reactive.Providers/Makefile +++ b/mcs/class/System.Reactive.Providers/Makefile @@ -6,10 +6,6 @@ LIBRARY = System.Reactive.Providers.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ -r:System.Reactive.Linq.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Reactive.Runtime.Remoting/Makefile b/mcs/class/System.Reactive.Runtime.Remoting/Makefile index fa919505a9c..c60726a075f 100644 --- a/mcs/class/System.Reactive.Runtime.Remoting/Makefile +++ b/mcs/class/System.Reactive.Runtime.Remoting/Makefile @@ -6,10 +6,6 @@ LIBRARY = System.Reactive.Runtime.Remoting.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ -r:System.Reactive.Linq.dll ifeq (2.1, $(FRAMEWORK_VERSION)) diff --git a/mcs/class/System.Reactive.Windows.Forms/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile index 88e64f4f948..942ba4b5b0d 100644 --- a/mcs/class/System.Reactive.Windows.Forms/Makefile +++ b/mcs/class/System.Reactive.Windows.Forms/Makefile @@ -6,11 +6,6 @@ LIBRARY = System.Reactive.Windows.Forms.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Windows.Forms LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll \ -r:System.Windows.Forms.dll ifeq (2.1, $(FRAMEWORK_VERSION)) diff --git a/mcs/class/System.Reactive.Windows.Threading/Makefile b/mcs/class/System.Reactive.Windows.Threading/Makefile index 446dcc0cacf..7faeb161f57 100644 --- a/mcs/class/System.Reactive.Windows.Threading/Makefile +++ b/mcs/class/System.Reactive.Windows.Threading/Makefile @@ -6,11 +6,6 @@ LIBRARY = System.Reactive.Windows.Threading.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq WindowsBase LIB_MCS_FLAGS = \ @more_build_args \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Reactive.Interfaces.dll \ - -r:System.Reactive.Core.dll \ - -r:System.Reactive.Linq.dll \ -r:WindowsBase.dll ifeq (true, $(GENERATE_RESOURCES)) diff --git a/mcs/class/System.Runtime.Caching/Makefile b/mcs/class/System.Runtime.Caching/Makefile index 5e761daab00..f93ecfbb496 100644 --- a/mcs/class/System.Runtime.Caching/Makefile +++ b/mcs/class/System.Runtime.Caching/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Runtime.Caching.dll LIB_REFS = System System.Data System.Configuration System.Core -LIB_MCS_FLAGS = -r:System.dll \ - -r:System.Data.dll \ - -r:System.Configuration.dll \ - -r:System.Core.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Runtime.DurableInstancing/Makefile b/mcs/class/System.Runtime.DurableInstancing/Makefile index 371f0abb5cb..bb0c8b42207 100644 --- a/mcs/class/System.Runtime.DurableInstancing/Makefile +++ b/mcs/class/System.Runtime.DurableInstancing/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Runtime.DurableInstancing.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.Core System.Xml.Linq -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.Core.dll -r:System.Xml.Linq.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Runtime.Remoting/Makefile b/mcs/class/System.Runtime.Remoting/Makefile index c09e2596f74..344d5669236 100644 --- a/mcs/class/System.Runtime.Remoting/Makefile +++ b/mcs/class/System.Runtime.Remoting/Makefile @@ -5,8 +5,7 @@ include ../../build/rules.make LIBRARY = System.Runtime.Remoting.dll LIB_REFS = System System.Web System.Xml System.Runtime.Serialization.Formatters.Soap -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Web.dll \ - /r:System.Xml.dll /r:System.Runtime.Serialization.Formatters.Soap.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618 /r:System.Runtime.Remoting.dll diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile index fdc8a6f5a6a..73f05ace2f4 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile @@ -6,7 +6,7 @@ include ../../build/rules.make LIBRARY = System.Runtime.Serialization.Formatters.Soap.dll LIB_REFS = System.Xml -LIB_MCS_FLAGS = /r:$(corlib) /r:System.Xml.dll +LIB_MCS_FLAGS = /r:$(corlib) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 EXTRA_DISTFILES = \ diff --git a/mcs/class/System.Runtime.Serialization.Json/Makefile b/mcs/class/System.Runtime.Serialization.Json/Makefile index baaffb6cb74..cf3d3873114 100644 --- a/mcs/class/System.Runtime.Serialization.Json/Makefile +++ b/mcs/class/System.Runtime.Serialization.Json/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Runtime.Serialization.Json.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.Core.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile index a075cad7553..88da7618a64 100644 --- a/mcs/class/System.Runtime.Serialization/Makefile +++ b/mcs/class/System.Runtime.Serialization/Makefile @@ -10,16 +10,13 @@ LIB_REFS = System System.Xml System.Core LIB_MCS_FLAGS = \ -unsafe \ /nowarn:168,169,219,414 \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Core.dll \ $(RESOURCE_FILES:%=/resource:%) RESOURCE_STRINGS = ../../../external/referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Data System.Configuration -LIB_MCS_FLAGS += /d:NET_3_0 /r:System.Data.dll /r:System.Configuration.dll +LIB_MCS_FLAGS += /d:NET_3_0 endif TEST_RESOURCE_FILES = \ diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile index 2bb303a8b01..fc6482cd06f 100644 --- a/mcs/class/System.Security/Makefile +++ b/mcs/class/System.Security/Makefile @@ -6,8 +6,8 @@ LIBRARY = System.Security.dll LIB_REFS = System System.Xml Mono.Security LIB_MCS_FLAGS = -nowarn:618 \ -d:SECURITY_DEP \ - -r:$(corlib) -r:System.dll -r:System.Xml.dll \ - -r:Mono.Security.dll -nowarn:414 + -r:$(corlib) \ + -nowarn:414 LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir) diff --git a/mcs/class/System.ServiceModel.Activation/Makefile b/mcs/class/System.ServiceModel.Activation/Makefile index f897fc7cbf5..ad7f73f1b92 100644 --- a/mcs/class/System.ServiceModel.Activation/Makefile +++ b/mcs/class/System.ServiceModel.Activation/Makefile @@ -5,7 +5,7 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Activation.dll LIB_REFS = System.Core System System.ServiceModel -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.ServiceModel.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = -r:System.dll -r:System.Core.dll diff --git a/mcs/class/System.ServiceModel.Discovery/Makefile b/mcs/class/System.ServiceModel.Discovery/Makefile index cf399e2e0d0..75422d19e74 100644 --- a/mcs/class/System.ServiceModel.Discovery/Makefile +++ b/mcs/class/System.ServiceModel.Discovery/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Discovery.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core System.Xml.Linq -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll -r:System.Xml.Linq.dll +LIB_MCS_FLAGS = ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration diff --git a/mcs/class/System.ServiceModel.Routing/Makefile b/mcs/class/System.ServiceModel.Routing/Makefile index 4e59b84e12a..ad9a78e6a60 100644 --- a/mcs/class/System.ServiceModel.Routing/Makefile +++ b/mcs/class/System.ServiceModel.Routing/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Routing.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll +LIB_MCS_FLAGS = ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration diff --git a/mcs/class/System.ServiceModel.Syndication/Makefile b/mcs/class/System.ServiceModel.Syndication/Makefile index 7555bc9dc4e..dc545984804 100644 --- a/mcs/class/System.ServiceModel.Syndication/Makefile +++ b/mcs/class/System.ServiceModel.Syndication/Makefile @@ -4,16 +4,14 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Syndication.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll +LIB_MCS_FLAGS = ifeq (moonlight_raw, $(PROFILE)) LIB_REFS += System.Xml.Serialization -LIB_MCS_FLAGS += /r:System.Xml.Serialization.dll endif ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration -LIB_MCS_FLAGS += /r:System.Configuration.dll endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.ServiceModel.Web.Extensions/Makefile b/mcs/class/System.ServiceModel.Web.Extensions/Makefile index 944702af77d..489cdd451f4 100644 --- a/mcs/class/System.ServiceModel.Web.Extensions/Makefile +++ b/mcs/class/System.ServiceModel.Web.Extensions/Makefile @@ -4,16 +4,14 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Web.Extensions.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core System.ServiceModel.Web -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll -r:System.ServiceModel.Web.dll +LIB_MCS_FLAGS = ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Xml.Serialization System.Net -LIB_MCS_FLAGS += /r:System.Xml.Serialization.dll /r:System.Net.dll endif ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration -LIB_MCS_FLAGS += /r:System.Configuration.dll endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.ServiceModel.Web/Makefile b/mcs/class/System.ServiceModel.Web/Makefile index 73cd92cc589..e8680e37f13 100644 --- a/mcs/class/System.ServiceModel.Web/Makefile +++ b/mcs/class/System.ServiceModel.Web/Makefile @@ -4,18 +4,15 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Web.dll LIB_REFS = System System.Xml System.Runtime.Serialization System.ServiceModel System.Core -LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.Core.dll +LIB_MCS_FLAGS = ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration System.Web.Extensions -LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0 \ - -r:System.Configuration.dll \ - -r:System.Web.Extensions.dll +LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0 endif ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += System.ServiceModel.Activation -LIB_MCS_FLAGS += -r:System.ServiceModel.Activation.dll endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile index fd5d3a0700b..5436992c25f 100644 --- a/mcs/class/System.ServiceModel/Makefile +++ b/mcs/class/System.ServiceModel/Makefile @@ -13,39 +13,22 @@ LIB_MCS_FLAGS = \ /nowarn:414,169,67,3005,436,219,618 \ /unsafe \ /d:TRACE \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Core.dll \ - /r:System.Runtime.Serialization.dll \ $(RESOURCE_FILES:%=/resource:%) ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_REFS += System.Configuration System.Data System.Security System.IdentityModel System.IdentityModel.Selectors System.Transactions System.Messaging System.Web System.Web.Services Mono.Security -LIB_MCS_FLAGS += /d:NET_3_0 \ - /r:System.Configuration.dll \ - /r:System.Data.dll \ - /r:System.Security.dll \ - /r:System.IdentityModel.dll \ - /r:System.IdentityModel.Selectors.dll \ - /r:System.Transactions.dll \ - /r:System.Messaging.dll \ - /r:System.Web.dll \ - /r:System.Web.Services.dll \ - /r:Mono.Security.dll +LIB_MCS_FLAGS += /d:NET_3_0 endif ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += System.Web.ApplicationServices -LIB_MCS_FLAGS += /r:System.Web.ApplicationServices.dll activation = $(the_libdir_base)System.ServiceModel.Activation.dll servicemodel_deps = $(activation) -LIB_REFS += System.ServiceModel.Activation LIB_REFS += System.Web.ApplicationServices ifneq (plainservice/,$(intermediate)) LIB_MCS_FLAGS += -define:HAS_ACTIVATION -r:System.ServiceModel.Activation.dll -LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll endif endif diff --git a/mcs/class/System.ServiceProcess/Makefile b/mcs/class/System.ServiceProcess/Makefile index 8cdb3847012..82de1c3ee28 100644 --- a/mcs/class/System.ServiceProcess/Makefile +++ b/mcs/class/System.ServiceProcess/Makefile @@ -4,8 +4,7 @@ include ../../build/rules.make LIBRARY = System.ServiceProcess.dll LIB_REFS = System System.Configuration.Install System.Windows.Forms -LIB_MCS_FLAGS = /r:System.dll /r:System.Configuration.Install.dll \ - /r:System.Windows.Forms.dll /nowarn:0618 +LIB_MCS_FLAGS = /nowarn:0618 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = diff --git a/mcs/class/System.Threading.Tasks.Dataflow/Makefile b/mcs/class/System.Threading.Tasks.Dataflow/Makefile index 195796c2592..83bdafab3cc 100644 --- a/mcs/class/System.Threading.Tasks.Dataflow/Makefile +++ b/mcs/class/System.Threading.Tasks.Dataflow/Makefile @@ -7,7 +7,7 @@ LIBRARY = System.Threading.Tasks.Dataflow.dll include ../../build/library.make LIB_REFS += System.Core System -LIB_MCS_FLAGS += -r:$(corlib) -r:System.Core.dll -r:System.dll +LIB_MCS_FLAGS += -r:$(corlib) TEST_MCS_FLAGS = -r:System.Core.dll -r:System.dll diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile index 66837a21808..46df964af01 100644 --- a/mcs/class/System.Transactions/Makefile +++ b/mcs/class/System.Transactions/Makefile @@ -7,10 +7,10 @@ MOBILE_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PR LIBRARY = System.Transactions.dll ifdef MOBILE_PROFILE LIB_REFS = System -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /define:MOBILE +LIB_MCS_FLAGS = /r:$(corlib) /define:MOBILE else LIB_REFS = System System.Configuration -LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Configuration.dll +LIB_MCS_FLAGS = /r:$(corlib) endif TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Web.Abstractions/Makefile b/mcs/class/System.Web.Abstractions/Makefile index 7facb022d00..bf8cbe5d8e4 100644 --- a/mcs/class/System.Web.Abstractions/Makefile +++ b/mcs/class/System.Web.Abstractions/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Web.Abstractions.dll LIB_REFS = System System.Core System.Web -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Web.dll +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Web.ApplicationServices/Makefile b/mcs/class/System.Web.ApplicationServices/Makefile index 70f852841e4..d7389f43e0d 100644 --- a/mcs/class/System.Web.ApplicationServices/Makefile +++ b/mcs/class/System.Web.ApplicationServices/Makefile @@ -4,9 +4,7 @@ include ../../build/rules.make LIBRARY = System.Web.ApplicationServices.dll LIB_REFS = System System.Configuration -LIB_MCS_FLAGS = -r:System.dll \ - -r:System.Configuration.dll \ - -d:SYSTEM_WEB_APPLICATIONSERVICES +LIB_MCS_FLAGS = -d:SYSTEM_WEB_APPLICATIONSERVICES EXTRA_DISTFILES = $(RESOURCE_FILES) diff --git a/mcs/class/System.Web.DynamicData/Makefile b/mcs/class/System.Web.DynamicData/Makefile index ef7981ebde6..4248b8629e2 100644 --- a/mcs/class/System.Web.DynamicData/Makefile +++ b/mcs/class/System.Web.DynamicData/Makefile @@ -4,21 +4,10 @@ include ../../build/rules.make LIBRARY = System.Web.DynamicData.dll LIB_REFS = System System.Core System.ComponentModel.DataAnnotations System.Data System.Data.Linq System.Drawing System.Web System.Web.Extensions System.Web.Abstractions System.Web.Routing -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.ComponentModel.DataAnnotations.dll \ - /r:System.Data.dll \ - /r:System.Data.Linq.dll \ - /r:System.Drawing.dll \ - /r:System.Web.dll \ - /r:System.Web.Extensions.dll \ - /r:System.Web.Abstractions.dll \ - /r:System.Web.Routing.dll +LIB_MCS_FLAGS = ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += System.Web.ApplicationServices -LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll endif # Use genresources.sh to generate the list below diff --git a/mcs/class/System.Web.Extensions.Design/Makefile b/mcs/class/System.Web.Extensions.Design/Makefile index 090a6fae248..6ea70f5bf6c 100644 --- a/mcs/class/System.Web.Extensions.Design/Makefile +++ b/mcs/class/System.Web.Extensions.Design/Makefile @@ -5,9 +5,7 @@ include ../../build/rules.make LIBRARY = System.Web.Extensions.Design.dll LIB_REFS = System System.Design System.Drawing System.Windows.Forms -LIB_MCS_FLAGS = \ - -define:NET_3_5 \ - -r:System.dll -r:System.Design.dll -r:System.Drawing.dll -r:System.Windows.Forms.dll +LIB_MCS_FLAGS = -define:NET_3_5 include ../../build/library.make diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile index 51280b82526..e7dd5e0f017 100644 --- a/mcs/class/System.Web.Extensions/Makefile +++ b/mcs/class/System.Web.Extensions/Makefile @@ -61,17 +61,6 @@ LIB_MCS_FLAGS = \ -define:NET_3_5 \ -define:SYSTEM_WEB_EXTENSIONS \ -r:$(corlib) \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Drawing.dll \ - -r:System.Data.dll \ - -r:System.Data.Linq.dll \ - -r:System.Xml.dll \ - -r:System.Web.dll \ - -r:System.Web.Services.dll \ - -r:System.Configuration.dll \ - -r:System.EnterpriseServices.dll \ - -r:System.ServiceModel.dll \ $(OTHER_LIB_MCS_FLAGS) \ $(RESOURCE_FILES:%=/resource:%) diff --git a/mcs/class/System.Web.Http.SelfHost/Makefile b/mcs/class/System.Web.Http.SelfHost/Makefile index 4aa07ed9109..f13d3b55f88 100644 --- a/mcs/class/System.Web.Http.SelfHost/Makefile +++ b/mcs/class/System.Web.Http.SelfHost/Makefile @@ -6,16 +6,13 @@ LIBRARY = System.Web.Http.SelfHost.dll System.Web.Http.SelfHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx $(RESGEN) "$<" "$@" - + System.Web.Http.SelfHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.SelfHost/Properties/SRResources.resx $(RESGEN) "$<" "$@" LIB_REFS = System.Core System System.Xml System.Configuration System.Net.Http System.Runtime.Serialization System.ServiceModel System.IdentityModel System.Web.Http System.Net.Http.Formatting -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Net.Http.dll \ - -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.IdentityModel.dll \ - -r:System.Web.Http.dll -r:System.Net.Http.Formatting.dll \ - -d:ASPNETMVC -keyfile:../winfx.pub -delaysign +LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign include ../../build/library.make diff --git a/mcs/class/System.Web.Http.WebHost/Makefile b/mcs/class/System.Web.Http.WebHost/Makefile index 651d19695d4..e0606bdbafb 100644 --- a/mcs/class/System.Web.Http.WebHost/Makefile +++ b/mcs/class/System.Web.Http.WebHost/Makefile @@ -6,17 +6,13 @@ LIBRARY = System.Web.Http.WebHost.dll System.Web.Http.WebHost.Properties.CommonWebApiResources.resources: ../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx $(RESGEN) "$<" "$@" - + System.Web.Http.WebHost.Properties.SRResources.resources: ../../../external/aspnetwebstack/src/System.Web.Http.WebHost/Properties/SRResources.resx $(RESGEN) "$<" "$@" LIB_REFS = System.Core System System.Xml System.Configuration System.Net.Http System.Runtime.Serialization System.ServiceModel System.IdentityModel System.Web.Http System.Net.Http.Formatting System.Web.Routing System.Web Microsoft.Web.Infrastructure -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Net.Http.dll \ - -r:System.Runtime.Serialization.dll -r:System.ServiceModel.dll -r:System.IdentityModel.dll \ - -r:System.Web.Http.dll -r:System.Net.Http.Formatting.dll -r:System.Web.Routing.dll -r:System.Web.dll \ - -r:Microsoft.Web.Infrastructure.dll \ - -d:ASPNETMVC -keyfile:../winfx.pub -delaysign +LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign include ../../build/library.make diff --git a/mcs/class/System.Web.Http/Makefile b/mcs/class/System.Web.Http/Makefile index 246d49feff8..fb50d52d2e9 100644 --- a/mcs/class/System.Web.Http/Makefile +++ b/mcs/class/System.Web.Http/Makefile @@ -12,8 +12,7 @@ System.Web.Http.Properties.SRResources.resources: ../../../external/aspnetwebsta LIB_REFS = System.Core System System.Xml System.Net.Http System.ComponentModel.DataAnnotations System.Net.Http.Formatting System.Runtime.Caching System.Runtime.Serialization System.Data.Linq -LIB_MCS_FLAGS = -r:System.Core.dll -r:System.dll -r:System.Xml.dll -r:System.Net.Http.dll -r:System.ComponentModel.DataAnnotations.dll \ - -r:System.Net.Http.Formatting.dll -r:System.Runtime.Caching.dll -r:System.Runtime.Serialization.dll -r:System.Data.Linq.dll \ +LIB_MCS_FLAGS = \ -d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ -resource:System.Web.Http.Properties.CommonWebApiResources.resources \ -resource:System.Web.Http.Properties.SRResources.resources diff --git a/mcs/class/System.Web.Mvc3/Makefile b/mcs/class/System.Web.Mvc3/Makefile index 16c5f64e3b3..024e52e89ea 100644 --- a/mcs/class/System.Web.Mvc3/Makefile +++ b/mcs/class/System.Web.Mvc3/Makefile @@ -13,22 +13,6 @@ LIB_MCS_FLAGS = \ /keyfile:../winfx.pub \ /d:MONO \ /delaysign \ - /r:Microsoft.Web.Infrastructure.dll \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Configuration.dll \ - /r:System.Data.dll \ - /r:System.Xml.dll \ - /r:System.Web.dll \ - /r:System.Web.Abstractions.dll \ - /r:System.Web.Routing.dll \ - /r:System.Web.Extensions.dll \ - /r:System.ComponentModel.DataAnnotations.dll \ - /r:System.Data.Linq.dll \ - /r:System.Runtime.Caching.dll \ - /r:System.Web.Razor.dll \ - /r:System.Web.WebPages.Razor.dll \ - /r:System.Web.WebPages.dll \ $(foreach r, $(RESOURCES), /resource:$(r),System.Web.Mvc.Resources.$(notdir $(r))) EXTRA_DISTFILES = $(RESX_DIST) diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile index cd1cf47ea9a..542360275c1 100644 --- a/mcs/class/System.Web.Razor/Makefile +++ b/mcs/class/System.Web.Razor/Makefile @@ -15,8 +15,6 @@ LIB_REFS = System System.Core LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub -delaysign \ - /r:System.dll \ - /r:System.Core.dll \ /d:ASPNETWEBPAGES \ /resource:System.Web.Razor.Resources.RazorResources.resources \ /resource:System.Web.Razor.Common.CommonResources.resources diff --git a/mcs/class/System.Web.Routing/Makefile b/mcs/class/System.Web.Routing/Makefile index 453a8eb052c..e2b0a9f1a96 100644 --- a/mcs/class/System.Web.Routing/Makefile +++ b/mcs/class/System.Web.Routing/Makefile @@ -4,11 +4,7 @@ include ../../build/rules.make LIBRARY = System.Web.Routing.dll LIB_REFS = System System.Core System.Web System.Web.Abstractions -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Web.dll \ - /r:System.Web.Abstractions.dll +LIB_MCS_FLAGS = ifdef DEBUG LIB_MCS_FLAGS += -define:DEBUG diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile index 406b427ad0c..d809d8c8317 100644 --- a/mcs/class/System.Web.Services/Makefile +++ b/mcs/class/System.Web.Services/Makefile @@ -32,7 +32,6 @@ system_web_services_deps = $(plainweb) LIB_REFS += System.Configuration LIB_MCS_FLAGS += \ - -r:System.Configuration.dll \ -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd \ -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \ -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd diff --git a/mcs/class/System.Web.WebPages.Deployment/Makefile b/mcs/class/System.Web.WebPages.Deployment/Makefile index 4dc001ae3b9..33d506be70a 100644 --- a/mcs/class/System.Web.WebPages.Deployment/Makefile +++ b/mcs/class/System.Web.WebPages.Deployment/Makefile @@ -15,11 +15,6 @@ LIB_REFS = System System.Core System.Configuration System.Web Microsoft.Web.Infr LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub -delaysign \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Configuration.dll \ - /r:System.Web.dll \ - /r:Microsoft.Web.Infrastructure.dll \ /d:ASPNETWEBPAGES \ /resource:System.Web.WebPages.Deployment.Common.CommonResources.resources \ /resource:System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources diff --git a/mcs/class/System.Web.WebPages.Razor/Makefile b/mcs/class/System.Web.WebPages.Razor/Makefile index 9546cc4363a..cb0e52dc33b 100644 --- a/mcs/class/System.Web.WebPages.Razor/Makefile +++ b/mcs/class/System.Web.WebPages.Razor/Makefile @@ -16,12 +16,6 @@ LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub \ /delaysign \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Configuration.dll \ - /r:System.Web.dll \ - /r:System.Web.WebPages.dll \ - /r:System.Web.Razor.dll \ /d:ASPNETWEBPAGES \ /resource:System.Web.WebPages.Razor.Resources.RazorWebResources.resources \ /resource:System.Web.WebPages.Razor.Common.CommonResources.resources diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile index 86c363d4e2b..394f2043a11 100644 --- a/mcs/class/System.Web.WebPages/Makefile +++ b/mcs/class/System.Web.WebPages/Makefile @@ -16,18 +16,6 @@ LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub \ /delaysign \ - /r:Microsoft.CSharp.dll \ - /r:Microsoft.Web.Infrastructure.dll \ - /r:System.dll \ - /r:System.ComponentModel.DataAnnotations.dll \ - /r:System.Configuration.dll \ - /r:System.Core.dll \ - /r:System.Data.Linq.dll \ - /r:System.Web.dll \ - /r:System.Web.WebPages.Deployment.dll \ - /r:System.Web.Razor.dll \ - /r:System.Xml.dll \ - /r:System.Xml.Linq.dll \ /d:ASPNETWEBPAGES \ /resource:System.Web.WebPages.Resources.WebPageResources.resources \ /resource:System.Web.WebPages.Common.CommonResources.resources diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile index 2d5ad39a152..4ba0bc94573 100644 --- a/mcs/class/System.Web/Makefile +++ b/mcs/class/System.Web/Makefile @@ -245,21 +245,13 @@ LIB_MCS_FLAGS = \ -unsafe \ -nowarn:612,618 \ -r:$(corlib) \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Drawing.dll \ - -r:System.Data.dll \ - -r:System.Xml.dll \ - -r:System.EnterpriseServices.dll \ - -r:System.Runtime.Serialization.Formatters.Soap \ - -r:System.ComponentModel.DataAnnotations.dll \ $(OTHER_LIB_MCS_FLAGS) \ $(RESX_RES:%=/resource:%) \ $(OTHER_RES:%=/resource:%) ifneq (plainweb/,$(intermediate)) LIB_REFS += System.Web.Services -LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:System.Web.Services.dll +LIB_MCS_FLAGS += -define:WEBSERVICES_DEP all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Makefile b/mcs/class/System.Windows.Forms.DataVisualization/Makefile index c19e041c5b8..4c169c043ae 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Makefile +++ b/mcs/class/System.Windows.Forms.DataVisualization/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Windows.Forms.DataVisualization.dll LIB_REFS = System System.Drawing System.Windows.Forms System.Core System.Data System.Xml -LIB_MCS_FLAGS = -r:System -r:System.Drawing -r:System.Windows.Forms -r:System.Core -r:System.Data -r:System.Xml +LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = diff --git a/mcs/class/System.Windows/Makefile b/mcs/class/System.Windows/Makefile index 67755fba9ca..c24e79129a6 100644 --- a/mcs/class/System.Windows/Makefile +++ b/mcs/class/System.Windows/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Windows.dll LIB_REFS = System -LIB_MCS_FLAGS = /r:System +LIB_MCS_FLAGS = PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile index 9ac47d7380b..2d0d84be4fa 100644 --- a/mcs/class/System.XML/Makefile +++ b/mcs/class/System.XML/Makefile @@ -16,7 +16,7 @@ endif PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE)) LIB_REFS = System -LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0618,0612,0642 +LIB_MCS_FLAGS = -r:$(corlib) -nowarn:0618,0612,0642 ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK endif diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile index c62739fc540..884452d6ed9 100644 --- a/mcs/class/System.Xaml/Makefile +++ b/mcs/class/System.Xaml/Makefile @@ -6,11 +6,7 @@ RESOURCE_FILES = LIBRARY = System.Xaml.dll LIB_REFS = System System.Xml System.Core -LIB_MCS_FLAGS = \ - /r:System.dll \ - /r:System.Xml.dll \ - /r:System.Core.dll \ - $(RESOURCE_FILES:%=/resource:%) +LIB_MCS_FLAGS = $(RESOURCE_FILES:%=/resource:%) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile index 8cefa8025f5..cd250c135ed 100644 --- a/mcs/class/System.Xml.Linq/Makefile +++ b/mcs/class/System.Xml.Linq/Makefile @@ -4,10 +4,7 @@ include ../../build/rules.make LIBRARY = System.Xml.Linq.dll LIB_REFS = System System.Core System.Xml -LIB_MCS_FLAGS = \ - -r:System.dll \ - -r:System.Core.dll \ - -r:System.Xml.dll +LIB_MCS_FLAGS = ifneq (2.1, $(FRAMEWORK_VERSION)) # This is a .NET 3.5+ only assembly, but built during the 2.0 build diff --git a/mcs/class/System.Xml.Serialization/Makefile b/mcs/class/System.Xml.Serialization/Makefile index 16adad2a2c5..f67cf54e8cc 100644 --- a/mcs/class/System.Xml.Serialization/Makefile +++ b/mcs/class/System.Xml.Serialization/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = System.Xml.Serialization.dll LIB_REFS = System.Xml System.ServiceModel -LIB_MCS_FLAGS = /r:System.Xml /r:System.ServiceModel +LIB_MCS_FLAGS = PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 50158f62f58..9e072e80c17 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -48,7 +48,7 @@ endif ifeq (secxml/, $(intermediate)) LOCAL_MCS_FLAGS = -lib:$(bare_libdir) LIB_REFS += System.Xml MonoSecurity=Mono.Security -LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(bare_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll +LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(bare_libdir)/System.dll endif # @@ -56,7 +56,7 @@ endif # ifndef intermediate LIB_REFS += System.Xml MonoSecurity=Mono.Security -LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(secxml_libdir)/System.dll -r:System.Xml.dll -r:MonoSecurity=Mono.Security.dll $(FINAL_MCS_FLAGS) +LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP -r:PrebuiltSystem=$(secxml_libdir)/System.dll $(FINAL_MCS_FLAGS) endif EXTRA_DISTFILES = \ diff --git a/mcs/class/SystemWebTestShim/Makefile b/mcs/class/SystemWebTestShim/Makefile index b21207b0075..6bf2ea3c9d2 100644 --- a/mcs/class/SystemWebTestShim/Makefile +++ b/mcs/class/SystemWebTestShim/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = SystemWebTestShim.dll LIB_REFS = System.Web System -LIB_MCS_FLAGS = -r:System.Web.dll -r:System.dll +LIB_MCS_FLAGS = NO_INSTALL = yes NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/WebMatrix.Data/Makefile b/mcs/class/WebMatrix.Data/Makefile index 388fe213386..476d3be7c22 100644 --- a/mcs/class/WebMatrix.Data/Makefile +++ b/mcs/class/WebMatrix.Data/Makefile @@ -4,8 +4,8 @@ include ../../build/rules.make LIBRARY = WebMatrix.Data.dll -include ../../build/library.make - LIB_REFS = System System.Data System.Core System.Configuration -LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Data.dll -r:System.Core.dll -r:System.Configuration.dll +LIB_MCS_FLAGS = -r:$(corlib) TEST_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:System.Data.dll -r:Mono.Data.Sqlite.dll -r:Microsoft.CSharp.dll + +include ../../build/library.make diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile index 228d5f73828..172a501446e 100644 --- a/mcs/class/WindowsBase/Makefile +++ b/mcs/class/WindowsBase/Makefile @@ -4,7 +4,7 @@ include ../../build/rules.make LIBRARY = WindowsBase.dll LIB_REFS = System System.Xml -LIB_MCS_FLAGS = -unsafe -r:System.dll -r:System.Xml.dll +LIB_MCS_FLAGS = -unsafe TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll -r:System.dll -r:System.Xml.dll -r:System.Core.dll ifeq (2.0, $(FRAMEWORK_VERSION)) @@ -12,7 +12,6 @@ LIB_MCS_FLAGS += -d:NET_3_0 endif ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_REFS += System.Xaml -LIB_MCS_FLAGS += -r:System.Xaml.dll TEST_MCS_FLAGS += -r:System.Xaml.dll endif diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile index 599fe0f695f..3ebba803f7e 100644 --- a/mcs/class/monodoc/Makefile +++ b/mcs/class/monodoc/Makefile @@ -112,13 +112,7 @@ LIB_MCS_FLAGS = \ /resource:Resources/mono-ecma.xsl,mono-ecma.xsl \ /resource:Resources/toc-html.xsl,toc-html.xsl \ $(IMAGE_RESOURCE_COMMAND) \ - /r:ICSharpCode.SharpZipLib \ - /r:$(corlib) \ - /r:System.dll \ - /r:System.Core.dll \ - /r:System.Xml.dll \ - /r:System.Xml.Linq.dll \ - /r:System.Configuration.dll + /r:$(corlib) CLEAN_FILES += $(the_lib).config |