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 4135db13b6fd825623e68edda3a510a6ed03a2d0..2272546a83c1a4d7df863d84f262f28ff5538012 100644 (file)
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -4,38 +4,19 @@ include ../../build/rules.make
 
 LIBRARY = System.Design.dll
 
-LIBRARY_USE_INTERMEDIATE_FILE = yes
-
-DRAWING_DESIGN_DEP := System.Drawing.Design.dll
-DRAWING_DESIGN_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(DRAWING_DESIGN_DEP))
-CYCLIC_DEPS := $(DRAWING_DESIGN_DEP)
-CYCLIC_DEP_FILES := $(DRAWING_DESIGN_DEP_FILE)
-
-
-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
-
-ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
-NO_SIGN_ASSEMBLY = yes
-NO_INSTALL = yes
-all-local: echo-warning
-.PHONY: echo-warning
-
-ifeq   (, $(strip $(CYCLIC_DEP_FILES)))
-echo-warning:
-       @echo "** Warning: System.Web.dll built without parts that depend on: $(CYCLIC_DEPS)"
-endif
-endif
+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
 
+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/
 
-ifdef DRAWING_DESIGN_DEP_FILE
-LIB_MCS_FLAGS += -define:DRAWING_DESIGN_DEP -r:$(DRAWING_DESIGN_DEP)
-$(build_lib): $(DRAWING_DESIGN_DEP_FILE)
+$(the_libdir_base)plaindesign/System.Design.dll:
+       $(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
 endif
+