Fixes build

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

diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index f4c130cc837bae35dab02a6af54222fdacd0ed0c..bf261067d24d0e10f2456efba60c4678a93a89e6 100644 (file)
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -3,14 +3,36 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Security.dll
-LIB_MCS_FLAGS = /nowarn:618 \
-       /r:$(corlib) /r:System.dll /r:System.Xml.dll \
-       /debug+
+LIB_MCS_FLAGS = -nowarn:618 \
+       -r:$(corlib) -r:System.dll -r:System.Xml.dll
 
-ifeq (net_2_0,$(PROFILE))
-LIB_MCS_FLAGS += /r:Mono.Security.dll
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,1595
+
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414
+TEST_MCS_FLAGS += -nowarn:168,183,414
+endif
+
+VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0, $(PROFILE))
+ifndef VALID_PROFILE
+# @echo "** Warning: System.Security.dll built without parts that depend on: Mono.Security.dll "
+else
+ LIB_MCS_FLAGS += -d:SECURITY_DEP
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
+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
 
 include ../../build/library.make
+
+# 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