projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Couple more 'bockbuild split' mixups
[mono.git]
/
mcs
/
class
/
System.ServiceModel
/
Makefile
diff --git
a/mcs/class/System.ServiceModel/Makefile
b/mcs/class/System.ServiceModel/Makefile
index 03dbd5fd9e59d7fd8b5b225e7ed63040f22fc059..683b096376f1e86e220a234101c1d60536a05512 100644
(file)
--- a/
mcs/class/System.ServiceModel/Makefile
+++ b/
mcs/class/System.ServiceModel/Makefile
@@
-8,7
+8,7
@@
RESOURCE_FILES = \
LIBRARY = System.ServiceModel.dll
LIBRARY = System.ServiceModel.dll
-LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
+LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
System.IdentityModel
LIB_MCS_FLAGS = \
/nowarn:414,169,67,3005,436,219,618 \
/unsafe \
LIB_MCS_FLAGS = \
/nowarn:414,169,67,3005,436,219,618 \
/unsafe \
@@
-20,7
+20,7
@@
LIB_REFS += System.ServiceModel.Internals
endif
ifneq (2.1, $(FRAMEWORK_VERSION))
endif
ifneq (2.1, $(FRAMEWORK_VERSION))
-LIB_REFS += System.Configuration System.Data System.Security System.IdentityModel
System.IdentityModel
.Selectors System.Transactions System.Messaging System.Web.Services Mono.Security
+LIB_REFS += System.Configuration System.Data System.Security System.IdentityModel.Selectors System.Transactions System.Messaging System.Web.Services Mono.Security
LIB_MCS_FLAGS += /d:NET_3_0
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += /d:NET_3_0
ifndef NO_SYSTEM_WEB_DEPENDENCY
@@
-34,7
+34,8
@@
activation = $(the_libdir_base)System.ServiceModel.Activation.dll
servicemodel_deps = $(activation)
ifneq (plainservice/,$(intermediate))
servicemodel_deps = $(activation)
ifneq (plainservice/,$(intermediate))
-LIB_MCS_FLAGS += -define:HAS_ACTIVATION -r:System.ServiceModel.Activation.dll
+LIB_REFS += System.ServiceModel.Activation
+LIB_MCS_FLAGS += -define:HAS_ACTIVATION
endif
endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
endif
endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY