projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"
[mono.git]
/
mcs
/
class
/
System.IdentityModel
/
Makefile
diff --git
a/mcs/class/System.IdentityModel/Makefile
b/mcs/class/System.IdentityModel/Makefile
index 5ca9642627e6ee29a5fd0f3cc0723a5d220e168d..aad3b05831f44dd5b595f33c61fd7d1d776ca24f 100644
(file)
--- a/
mcs/class/System.IdentityModel/Makefile
+++ b/
mcs/class/System.IdentityModel/Makefile
@@
-2,21
+2,32
@@
thisdir = class/System.IdentityModel
SUBDIRS =
include ../../build/rules.make
SUBDIRS =
include ../../build/rules.make
-ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
-ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
-OTHER_LIB_MCS_FLAGS = -r:System.Web.ApplicationServices.dll
-endif
+ifndef NO_MONO_SECURITY
+MONO_SECURITY=Mono.Security
endif
LIBRARY = System.IdentityModel.dll
endif
LIBRARY = System.IdentityModel.dll
-LIB_REFS = System System.Xml System.Security System.Configuration Mono.Security System.Runtime.Serialization
+LIB_REFS = System System.Xml System.Security $(MONO_SECURITY) System.Runtime.Serialization
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = \
/d:NET_3_0 \
$(OTHER_LIB_MCS_FLAGS)
LIB_MCS_FLAGS = \
/d:NET_3_0 \
$(OTHER_LIB_MCS_FLAGS)
+ifneq (2.1, $(FRAMEWORK_VERSION))
+LIB_REFS += System.Configuration
+endif
+
ifndef NO_SYSTEM_WEB_DEPENDENCY
ifndef NO_SYSTEM_WEB_DEPENDENCY
+ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Web
endif
LIB_REFS += System.Web
endif
+endif
+
+ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIB_REFS += System.Web.ApplicationServices
+endif
+endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
@@
-26,12
+37,4
@@
EXTRA_DISTFILES = \
Test/Resources/test.pfx \
Test/Resources/test2.pfx
Test/Resources/test.pfx \
Test/Resources/test2.pfx
-VALID_PROFILE := $(filter net_4_5 xammac_net_4_5, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.IdentityModel.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
include ../../build/library.make
include ../../build/library.make