Merge pull request #2802 from BrzVlad/feature-evacuation-opt2

[mono.git] / mcs / class / System.Security / Makefile

diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index c57de5341cc92701599ec3f6be12546631e5fe4f..5c009acb56608c1d391e86faea97071af7e3f33e 100644 (file)
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -3,16 +3,14 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Security.dll
+LIB_REFS = secxml/System bare/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
+       -nowarn:414
 
-LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
+LOCAL_MCS_FLAGS =
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414,1595
-
-VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0 net_4_5, $(PROFILE))
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414
 
 EXTRA_DISTFILES = \
        Test/System.Security.Cryptography.Xml/sample.pfx \
@@ -33,12 +31,3 @@ $(the_libdir_base)/Mono.Security.dll:
        (cd ../Mono.Security; $(MAKE))
 
 .NOTPARALLEL: $(secxml_libdir)/System.dll $(bare_libdir)/Mono.Security.dll
-
-# run the PKITS tests only if the data was installed/activated, otherwise ignore them
-ifeq (net_2_0, $(PROFILE))
-pkits_files := $(wildcard ../System/Test/System.Security.Cryptography.X509Certificates/pkits/hint)
-ifndef pkits_files
-TEST_HARNESS_EXCLUDES = -exclude:NotWorking,ValueAdd,CAS,InetAccess,PKITS
-TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude:NotDotNet,CAS,PKITS
-endif
-endif