X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Reactive.Windows.Forms%2FMakefile;h=ef3327d3e3e3dd39af41698bb97d9b7ef7d9d372;hb=dfac8517b91687f11479801fa0a2191585b1ad4c;hp=63b3fe0f4a529541c664f7111fd81fbb45896f7a;hpb=56d9663bb2bef253fbbcaed814bbc69a51a7f9d5;p=mono.git diff --git a/mcs/class/System.Reactive.Windows.Forms/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile index 63b3fe0f4a5..ef3327d3e3e 100644 --- a/mcs/class/System.Reactive.Windows.Forms/Makefile +++ b/mcs/class/System.Reactive.Windows.Forms/Makefile @@ -3,35 +3,24 @@ SUBDIRS = include ../../build/rules.make LIBRARY = System.Reactive.Windows.Forms.dll +LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Windows.Forms 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:System.Windows.Forms.dll + @more_build_args 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 -VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE)) -ifndef VALID_PROFILE -LIBRARY_NAME = dummy-System.System.Reactive.Windows.Forms.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