Merge pull request #2819 from BrzVlad/fix-major-log

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

diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index c4683c71e8353a262daade100944325fe22732b6..3dc11aa3b01e293dc886b475ccd6ff36704715d2 100644 (file)
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -4,14 +4,15 @@ include ../../build/rules.make
 
 LIBRARY = System.Design.dll
 
+LIB_REFS = System System.Xml plainweb/System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
+LIB_MCS_FLAGS =
 
-LIB_REFS = System System.Xml System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
-LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Web.dll \
-       -r:System.Windows.Forms.dll -r:System.Drawing.dll \
-       -r:Accessibility.dll -r:System.Data.dll \
-       -r:System.Configuration.dll
-
-TEST_MCS_FLAGS = /r:System.dll -r:System.Drawing.dll -r:System.Windows.Forms
+TEST_LIB_REFS = System System.Drawing System.Windows.Forms
+TEST_MCS_FLAGS =
 
 include ../../build/library.make
 
+ifneq (plaindesign/,$(intermediate))
+$(the_libdir_base)plaindesign/System.Design.dll:
+       $(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
+endif