Merge pull request #1817 from alexanderkyte/bug30085

[mono.git] / mcs / class / System.Web.Services / Makefile

diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 406b427ad0cbf4a0a769b2846ce61237385fbb1e..2ba370c04ab51bc78b7aa505fcefbfb158a0aebe 100644 (file)
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -15,24 +15,21 @@ LIB_MCS_FLAGS = \
        -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \
        -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd
 else
-LIB_REFS = System System.EnterpriseServices System.Xml System.Web
-LIB_MCS_FLAGS = \
-       -nowarn:649 -nowarn:169                 \
-       -r:$(corlib)                            \
-       -r:System.dll                           \
-       -r:System.EnterpriseServices.dll        \
-       -r:System.Xml.dll                       \
-       -r:System.Web.dll
+LIB_REFS = System System.EnterpriseServices System.Xml System.Web System.DirectoryServices System.Data System.Design
+LIB_MCS_FLAGS = -nowarn:168,169,219,414,612,649 -d:MONO_BROKEN_CONFIGURATION_DLL
 
 plainweb_dir = $(the_libdir_base)plainweb
-LOCAL_MCS_FLAGS = -lib:$(plainweb_dir)
-
 plainweb = $(plainweb_dir)/System.Web.dll
 system_web_services_deps = $(plainweb)
 
+plaindesign_dir = $(the_libdir_base)plaindesign
+plaindesign = $(plaindesign_dir)/System.Design.dll
+system_design_deps = $(plaindesign)
+
+LOCAL_MCS_FLAGS = -lib:$(plaindesign_dir) -lib:$(plainweb_dir)
+
 LIB_REFS += System.Configuration
 LIB_MCS_FLAGS += \
-       -r:System.Configuration.dll \
        -resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd \
        -resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \
        -resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd
@@ -49,9 +46,12 @@ EXTRA_DISTFILES = \
 
 include ../../build/library.make
 
-$(the_libdir_base)$(LIBRARY): $(system_web_services_deps)
+$(the_libdir_base)$(LIBRARY): $(system_web_services_deps) $(system_design_deps)
 
 $(plainweb):
        (cd ../System.Web; $(MAKE) $@)
 
-.NOTPARALLEL: $(plainweb)
+$(plaindesign):
+       (cd ../System.Design; $(MAKE) $@)
+
+.NOTPARALLEL: $(plainweb) $(plaindesign)