Merge pull request #2802 from BrzVlad/feature-evacuation-opt2

[mono.git] / mcs / class / System.Messaging / Makefile

diff --git a/mcs/class/System.Messaging/Makefile b/mcs/class/System.Messaging/Makefile
index 6a4b96a572d0d9bf561463296fdf028dd790d694..0412ea01555cf6bbcf44cb375c526bc75b3406bd 100644 (file)
--- a/mcs/class/System.Messaging/Makefile
+++ b/mcs/class/System.Messaging/Makefile
@@ -3,15 +3,22 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Messaging.dll
-LIB_REFS = System System.Configuration.Install System.Drawing System.Windows.Forms System.Xml Mono.Messaging
+LIB_REFS = System System.Xml Mono.Messaging System.Configuration.Install
+
+ifndef NO_SYSTEM_DRAWING_DEPENDENCY
+LIB_REFS += System.Drawing
+endif
+
 LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 \
-               /r:nunit.mocks.dll
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
+TEST_LIB_REFS = nunit.mocks
 
 EXTRA_DISTFILES = System.Messaging/MessageQueue.resx
 
-ifdef MESSAGING_NO_WINFORMS
+ifdef NO_WINFORMS_DEPENDENCY
 LIB_MCS_FLAGS += -d:NO_WINFORMS_DEPENDENCY
+else
+LIB_REFS += System.Windows.Forms
 endif
 
 include ../../build/library.make