projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4045 from lambdageek/bug-47867
[mono.git]
/
mcs
/
class
/
System.Runtime.Serialization
/
Makefile
diff --git
a/mcs/class/System.Runtime.Serialization/Makefile
b/mcs/class/System.Runtime.Serialization/Makefile
index 468cd9f4104c99106c80d7341da39d6d1190115c..2846091bf4da709cda950411f76a90037fcdae46 100644
(file)
--- a/
mcs/class/System.Runtime.Serialization/Makefile
+++ b/
mcs/class/System.Runtime.Serialization/Makefile
@@
-5,30
+5,37
@@
include ../../build/rules.make
RESOURCE_FILES =
LIBRARY = System.Runtime.Serialization.dll
RESOURCE_FILES =
LIBRARY = System.Runtime.Serialization.dll
-LIB_REFS = System System.Xml System.Core System.ServiceModel.Internals
SMDiagnostics
+LIB_REFS = System System.Xml System.Core System.ServiceModel.Internals
LIB_MCS_FLAGS = \
-unsafe \
-d:NO_DYNAMIC_CODEGEN \
LIB_MCS_FLAGS = \
-unsafe \
-d:NO_DYNAMIC_CODEGEN \
- /nowarn:168,169,219,414 \
+ /nowarn:168,169,219,414
,618,1634
\
$(RESOURCE_FILES:%=/resource:%)
$(RESOURCE_FILES:%=/resource:%)
+TXT_RESOURCE_STRINGS = ../referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt
ifneq (2.1, $(FRAMEWORK_VERSION))
ifneq (2.1, $(FRAMEWORK_VERSION))
-LIB_REFS += System.Data System.Configuration
+LIB_REFS += System.Data System.Configuration
SMDiagnostics
LIB_MCS_FLAGS += /d:NET_3_0
else
LIB_MCS_FLAGS += /d:NO_CONFIGURATION /d:NO_SECURITY_ATTRIBUTES /d:NO_CODEDOM /d:NO_DESKTOP_SECURITY
endif
LIB_MCS_FLAGS += /d:NET_3_0
else
LIB_MCS_FLAGS += /d:NO_CONFIGURATION /d:NO_SECURITY_ATTRIBUTES /d:NO_CODEDOM /d:NO_DESKTOP_SECURITY
endif
+ifdef XAMMAC_4_5
+LIB_MCS_FLAGS += /d:NO_CONFIGURATION
+endif
+
TEST_RESOURCE_FILES = \
Test/Resources/WSDL/collections.wsdl \
Test/Resources/WSDL/custom-collections.wsdl
TEST_RESOURCE_FILES = \
Test/Resources/WSDL/collections.wsdl \
Test/Resources/WSDL/custom-collections.wsdl
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
/r:System.ServiceModel.dll /r:System.Web.Services.dll \
- $(TEST_RESOURCE_FILES:%=/resource:%)
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
$(TEST_RESOURCE_FILES:%=/resource:%)
+TEST_LIB_REFS = System.ServiceModel System.Web.Services
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES) \
Test/Resources/FrameworkTypes/* \
Test/Resources/Schemas/*.xsd \
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES) \
Test/Resources/FrameworkTypes/* \
Test/Resources/Schemas/*.xsd \
- Test/System.Runtime.Serialization/one.xml
+ Test/System.Runtime.Serialization/one.xml \
+ ReferenceSource.common.sources \
+ ReferenceSource.desktop.sources
include ../../build/library.make
include ../../build/library.make