X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2FMakefile;h=51583cab7f6925610ada5f1c2877d6ab1a8a9362;hb=460827a8c160f35c8e2ace91e2318e3748b2b701;hp=8a8fad3b0a8e5d25e6efcf26c0b5b70a7feb8723;hpb=0443306d611d0830e27327e1f0a3ef3457dfa535;p=mono.git

diff --git a/mcs/class/Managed.Windows.Forms/Makefile b/mcs/class/Managed.Windows.Forms/Makefile
index 8a8fad3b0a8..51583cab7f6 100644
--- a/mcs/class/Managed.Windows.Forms/Makefile
+++ b/mcs/class/Managed.Windows.Forms/Makefile
@@ -8,7 +8,7 @@ LIB_MCS_FLAGS = /unsafe \
 	/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 \
@@ -70,25 +70,34 @@ IMAGES_RESOURCES = \
 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_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 $@