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 #1155 from steffen-kiess/json-string
[mono.git]
/
mcs
/
class
/
System.Reactive.Providers
/
Makefile
diff --git
a/mcs/class/System.Reactive.Providers/Makefile
b/mcs/class/System.Reactive.Providers/Makefile
index 44088a17101c830f8e70d80864bbd4bd9ba46de2..d3badf673828dad0af2a5acf3624abb9f4a72fc7 100644
(file)
--- a/
mcs/class/System.Reactive.Providers/Makefile
+++ b/
mcs/class/System.Reactive.Providers/Makefile
@@
-3,12
+3,9
@@
SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Reactive.Providers.dll
include ../../build/rules.make
LIBRARY = System.Reactive.Providers.dll
+LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
LIB_MCS_FLAGS = \
@more_build_args \
LIB_MCS_FLAGS = \
@more_build_args \
- -r:System.dll \
- -r:System.Core.dll \
- -r:System.Reactive.Interfaces.dll \
- -r:System.Reactive.Core.dll \
-r:System.Reactive.Linq.dll
ifeq (true, $(GENERATE_RESOURCES))
-r:System.Reactive.Linq.dll
ifeq (true, $(GENERATE_RESOURCES))
@@
-25,19
+22,19
@@
RESOURCES = $(RESX_RESOURCES)
PREBUILT = $(RESX_RESOURCES:=.prebuilt)
ifeq (2.1, $(FRAMEWORK_VERSION))
PREBUILT = $(RESX_RESOURCES:=.prebuilt)
ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:NO_TASK_DELAY
+LIB_MCS_FLAGS += -d:NO_TASK_DELAY
-d:HAS_AWAIT
endif
NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION))
ifdef NET_4_5
endif
NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION))
ifdef NET_4_5
-LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC
+LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC
-d:HAS_AWAIT
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
-VALID_PROFILE := $(filter monodroid
net_4_0
net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter monodroid
xammac
net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.System.Reactive.Providers.dll
NO_SIGN_ASSEMBLY = yes
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.System.Reactive.Providers.dll
NO_SIGN_ASSEMBLY = yes