Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"

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

diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index 5c009acb56608c1d391e86faea97071af7e3f33e..ae2de1a637046792e606012f5a547294f48ade72 100644 (file)
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -2,11 +2,17 @@ thisdir = class/System.Security
 SUBDIRS = 
 include ../../build/rules.make
 
+ifndef NO_MONO_SECURITY
+MONO_SECURITY_DLL=$(the_libdir_base)/Mono.Security.dll
+MONO_SECURITY=Mono.Security
+endif
+
 LIBRARY = System.Security.dll
-LIB_REFS = secxml/System bare/System.Xml Mono.Security
-LIB_MCS_FLAGS = -nowarn:618 \
-       -d:SECURITY_DEP \
-       -nowarn:414
+LIB_REFS = secxml/System bare/System.Xml $(MONO_SECURITY)
+KEYFILE = ../msfinal.pub
+LIB_MCS_FLAGS = \
+       -nowarn:414,618 \
+       -d:SECURITY_DEP,SYSTEM_SECURITY_DLL
 
 LOCAL_MCS_FLAGS =
 
@@ -20,9 +26,11 @@ EXTRA_DISTFILES = \
        Test/System.Security.Cryptography.Pkcs/detached.data \
        Test/System.Security.Cryptography.Pkcs/detached.p7
 
+RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Security.Cryptography.Xml/src/Resources/Strings.resx
+
 include ../../build/library.make
 
-$(build_lib): $(secxml_libdir)/System.dll $(the_libdir_base)/Mono.Security.dll
+$(build_lib): $(secxml_libdir)/System.dll $(MONO_SECURITY_DLL)
 
 $(secxml_libdir)/System.dll:
        (cd ../System; $(MAKE) $@)