[mkbundle] support satellite assemblies (#3448)

[mono.git] / mcs / class / System.Reactive.Windows.Threading / Makefile

diff --git a/mcs/class/System.Reactive.Windows.Threading/Makefile b/mcs/class/System.Reactive.Windows.Threading/Makefile
index 8e1641a8cb5793371b6bb28fe38a255c74a1979f..66a3ff14f6c6518b55254691c13c1d65fd52e02e 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Threading/Makefile
+++ b/mcs/class/System.Reactive.Windows.Threading/Makefile
@@ -3,14 +3,9 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Reactive.Windows.Threading.dll
+LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq WindowsBase
 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 \
-               -r:WindowsBase.dll
+               @more_build_args
 
 ifeq (true, $(GENERATE_RESOURCES))
 LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -26,25 +21,19 @@ RESOURCES = $(RESX_RESOURCES)
 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
-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)
 
-VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.System.Reactive.Windows.Threading.dll
-NO_SIGN_ASSEMBLY = yes
-endif
-
-INSTALL_PROFILE := $(filter net_4_5, $(PROFILE))
+INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
 ifndef INSTALL_PROFILE
 NO_INSTALL = yes
 endif