Merge pull request #1319 from directhex/systemwide-per-arch-aot-cache

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

diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index 4a5122aaf2170f5fc21d2f3ae7a7685a78dc7881..752a5f3f82b2a6efa84b57d1f7c3bc224b07efc2 100644 (file)
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -4,20 +4,41 @@ include ../../build/rules.make
 
 LIBRARY = System.Security.dll
 LIB_MCS_FLAGS = -nowarn:618 \
+       -d:SECURITY_DEP \
        -r:$(corlib) -r:System.dll -r:System.Xml.dll \
-       -debug+
+       -r:Mono.Security.dll -nowarn:414
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,1595
+LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
 
-ifeq (net_2_0,$(PROFILE))
-LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414
-TEST_MCS_FLAGS += -nowarn:168,183,414
-endif
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:168,169,183,219,414,1595
+
+VALID_PROFILE := $(filter moonlight_raw net_4_0 net_4_5, $(PROFILE))
 
 EXTRA_DISTFILES = \
        Test/System.Security.Cryptography.Xml/sample.pfx \
        Test/System.Security.Cryptography.Xml/EncryptedXmlSample1.xml \
        Test/System.Security.Cryptography.Xml/EncryptedXmlSample2.xml \
-       Test/System.Security.Cryptography.Xml/EncryptedXmlSample3.xml
+       Test/System.Security.Cryptography.Xml/EncryptedXmlSample3.xml \
+       Test/System.Security.Cryptography.Pkcs/detached.data \
+       Test/System.Security.Cryptography.Pkcs/detached.p7
 
 include ../../build/library.make
+
+$(build_lib): $(secxml_libdir)/System.dll $(the_libdir_base)/Mono.Security.dll
+
+$(secxml_libdir)/System.dll:
+       (cd ../System; $(MAKE) $@)
+
+$(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