Merge pull request #394 from directhex/master

[mono.git] / mcs / class / Managed.Windows.Forms / Makefile

diff --git a/mcs/class/Managed.Windows.Forms/Makefile b/mcs/class/Managed.Windows.Forms/Makefile
index ce811a2d1995a1b389fdfe9ce8ca86a5203f60a6..4f96023a6c81750740b96816e1ad30f199d91360 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Makefile
+++ b/mcs/class/Managed.Windows.Forms/Makefile
@@ -7,15 +7,19 @@ LIB_MCS_FLAGS = /unsafe \
        /r:$(corlib) /r:System.dll /r:System.Xml.dll \
        /r:System.Drawing.dll /r:Accessibility.dll \
        /r:System.Data.dll /r:Mono.Posix.dll \
-       /r:System.Design.dll    \
+       /r:Mono.WebBrowser \
+       /r:System.Configuration.dll \
        @System.Windows.Forms.dll.resources \
-       -debug
+       -nowarn:618,612,809
+
+ifeq (true, $(GENERATE_RESOURCES))
+LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
+endif
 
 RESX_RESOURCES = \
-       resources/System.Windows.Forms.resources \
-       resources/System.Windows.Forms.en.resources \
-       resources/System.Windows.Forms.de.resources \
        resources/keyboards.resources
+       
+CLEAN_FILES += $(RESX_RESOURCES)
 
 CUR_RESOURCES = resources/NWSE.cur resources/NESW.cur \
        resources/SplitterNS.cur \
@@ -57,20 +61,35 @@ IMAGES_RESOURCES = \
        resources/16_user-home.png              \
        resources/32_user-home.png              \
        resources/user-home.png         \
-       resources/dialog-error.png              \
-       resources/dialog-information.png        \
-       resources/dialog-question.png           \
-       resources/dialog-warning.png            \
+       resources/16_dialog-error.png           \
+       resources/16_dialog-information.png     \
+       resources/16_dialog-warning.png         \
        resources/1-up.png                      \
        resources/2-up.png                      \
        resources/3-up.png                      \
        resources/4-up.png                      \
-       resources/6-up.png
+       resources/6-up.png                      \
+       resources/nav_delete.png                \
+       resources/nav_end.png                   \
+       resources/nav_first.png                 \
+       resources/nav_previous.png              \
+       resources/nav_next.png                  \
+       resources/nav_plus.png                  \
+       resources/image-missing.png             \
+       resources/image-x-generic.png           \
+       resources/propertygrid-alphabetical.png \
+       resources/propertygrid-categorized.png  \
+       resources/EventsTab.bmp                 \
+       resources/PropertiesTab.bmp             \
+       resources/propertygrid-propertypages.png        \
+       resources/mono.ico                      \
+       resources/errorProvider.ico
 
 
 TEST_DISTFILES = \
        M.gif \
        Test/resources/a.cur \
+       Test/resources/32x32.ico \
        Test/System.Resources/compat_1_1.resx \
        Test/System.Resources/compat_2_0.resx \
        Test/System.Windows.Forms/bitmaps/a.png
@@ -81,18 +100,17 @@ EXTRA_DISTFILES = \
        $(IMAGES_RESOURCES) \
        $(TEST_DISTFILES)
 
-TEST_MCS_FLAGS = /r:System.Data.dll /r:System.Drawing.dll \
-       -resource:Test/resources/a.cur,a.cur
-
-SWF.csproj: System.Windows.Forms.dll.sources System.Windows.Forms.dll.resources build-csproj
-       ./build-csproj
-
-SWF2k5.csproj: System.Windows.Forms.dll.sources System.Windows.Forms.dll.resources build-csproj2k5
-       ./build-csproj2k5
+TEST_MCS_FLAGS = /r:System.Data.dll /r:System.Drawing.dll /r:Accessibility.dll -r:System.dll -r:System.Xml.dll \
+       -resource:Test/resources/a.cur,a.cur \
+       -resource:Test/resources/32x32.ico,32x32.ico \
+       -nowarn:618,612
 
 include ../../build/library.make
 
-$(the_lib): $(RESOURCES) SWF.csproj SWF2k5.csproj
+TEST_HARNESS_EXCLUDES = -exclude=Interactive,NotWorking,ValueAdd,CAS,InetAccess
+TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude=Interactive,NotDotNet,CAS
+
+$(the_lib): $(RESOURCES)
 
 $(RESX_RESOURCES): %.resources: %.resx
        $(RESGEN) $< || cp $@.prebuilt $@