2007-06-08 Jonathan Pobst <monkey@jpobst.com>

[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 e8419ca38954e2ba2529a57f2f575d2aa87d567c..2966cfd4236f80adbd328546afa11eef2095c613 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Makefile
+++ b/mcs/class/Managed.Windows.Forms/Makefile
@@ -3,15 +3,12 @@ include ../../build/rules.make
 
 LIBRARY = System.Windows.Forms.dll
 
-# UTF-8
-CODEPAGE = 65001
-
 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 \
        @System.Windows.Forms.dll.resources \
-       /nowarn:649 /nowarn:169 /nowarn:67 /nowarn:108 /nowarn:114 -debug
+       -debug
 
 RESX_RESOURCES = \
        resources/System.Windows.Forms.resources \
@@ -34,41 +31,82 @@ RESOURCES = $(RESX_RESOURCES) $(CUR_RESOURCES)
 PREBUILT = $(RESX_RESOURCES:=.prebuilt)
 
 IMAGES_RESOURCES = \
-       resources/computer_16.png               \
-       resources/computer_32.png               \
+       resources/16_computer.png               \
+       resources/32_computer.png               \
        resources/computer.png                  \
-       resources/document-open_16.png          \
-       resources/document-open_32.png          \
+       resources/16_document-open.png          \
+       resources/32_document-open.png          \
        resources/document-open.png             \
-       resources/folder_16.png                 \
+       resources/16_folder.png                 \
        resources/folder-new.png                \
        resources/folder.png                    \
-       resources/folder-remote_16.png          \
-       resources/folder-remote_32.png          \
+       resources/16_folder-remote.png          \
+       resources/32_folder-remote.png          \
        resources/folder-remote.png             \
        resources/go-previous.png               \
        resources/go-top.png                    \
+       resources/22_page-magnifier.png         \
        resources/preferences-system-windows.png\
+       resources/16_printer.png                \
+       resources/32_printer.png                \
        resources/text-x-generic.png            \
-       resources/user-desktop_16.png           \
-       resources/user-desktop_32.png           \
-       resources/user-desktop.png
+       resources/16_user-desktop.png           \
+       resources/32_user-desktop.png           \
+       resources/user-desktop.png              \
+       resources/16_user-home.png              \
+       resources/32_user-home.png              \
+       resources/user-home.png         \
+       resources/dialog-error.png              \
+       resources/16_dialog-error.png           \
+       resources/dialog-information.png        \
+       resources/16_dialog-information.png     \
+       resources/dialog-question.png           \
+       resources/dialog-warning.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/nav_delete.png                \
+       resources/nav_end.png                   \
+       resources/nav_first.png                 \
+       resources/nav_previous.png              \
+       resources/nav_next.png                  \
+       resources/nav_plus.png
+
+
+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
 
 EXTRA_DISTFILES = \
        README System.Windows.Forms.dll.resources \
-       $(RESX_RESOURCES:.resources=.resx) $(CUR_RESOURCES) $(PREBUILT) build-csproj \
+       $(RESX_RESOURCES:.resources=.resx) $(CUR_RESOURCES) $(PREBUILT) build-csproj build-csproj2k5 \
        $(IMAGES_RESOURCES) \
-       Test/resources/a.cur
+       $(TEST_DISTFILES)
 
 TEST_MCS_FLAGS = /r:System.Data.dll /r:System.Drawing.dll \
-       -resource:Test/resources/a.cur,a.cur
+       -resource:Test/resources/a.cur,a.cur \
+       -resource:Test/resources/32x32.ico,32x32.ico \
+       -nowarn:618,612
 
-SWF.csproj: System.Windows.Forms.dll.sources
+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
+
 include ../../build/library.make
 
-$(the_lib): $(RESOURCES) SWF.csproj
+TEST_HARNESS_EXCLUDES = /exclude:Interactive,NotWorking,ValueAdd,CAS,InetAccess
+TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:Interactive,NotDotNet,CAS
+
+$(the_lib): $(RESOURCES) SWF.csproj SWF2k5.csproj
 
 $(RESX_RESOURCES): %.resources: %.resx
        $(RESGEN) $< || cp $@.prebuilt $@