Merge pull request #4045 from lambdageek/bug-47867

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

diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index dc43ab8fc468b802d9767d0632a418a794dc1267..2272546a83c1a4d7df863d84f262f28ff5538012 100644 (file)
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -4,13 +4,19 @@ 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 = -nowarn:436 -nowarn:612,618,649,67,672
 
-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))
+csproj-local:
+       $(MAKE) csproj-local intermediate=plaindesign/
+
+$(the_libdir_base)plaindesign/System.Design.dll:
+       $(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
+endif
+