[build] Change the way how mcs references are passed to compiler to always use full...

[mono.git] / mcs / class / System.Drawing / Makefile

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index 81c2560b1d76bf92d683e32f506e8cb1acb79a1c..59ff776b9f1ccbf1bb35ea36e60206a59417782f 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -4,26 +4,22 @@ SUBDIRS =
 
 LIBRARY = System.Drawing.dll
 
-LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169 \
+LIB_REFS = System
+LIB_MCS_FLAGS = /unsafe \
        -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \
        -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
-       -resource:Assembly/Question.ico,Question.ico
+       -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
-        -r:System.Drawing.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Xml.dll \
-       -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
+TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml
 
-ifeq (net_1_1_java, $(PROFILE))
-LIB_MCS_FLAGS +=                               \
-       -r:System.Xml.dll                       \
-       -r:rt.dll                               \
-       -r:J2SE.Helpers.dll
-endif
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
+       -nowarn:0618 -nowarn:219 -nowarn:169
 
 include ../../build/library.make
 
 EXTRA_DISTFILES = Test/resources/indexed.png   \
        Test/System.Drawing/bitmaps/1bit.png    \
+       Test/System.Drawing/bitmaps/81674-2bpp.png      \
        Test/System.Drawing/bitmaps/4bit.png    \
        Test/System.Drawing/bitmaps/almogaver1bit.bmp   \
        Test/System.Drawing/bitmaps/almogaver24bits1.bmp        \
@@ -34,7 +30,10 @@ EXTRA_DISTFILES = Test/resources/indexed.png \
        Test/System.Drawing/bitmaps/almogaver-os2.bmp   \
        Test/System.Drawing/bitmaps/maketransparent.bmp \
        Test/System.Drawing/bitmaps/nature24bits.gif    \
+       Test/System.Drawing/bitmaps/nature24bits87.gif  \
+       Test/System.Drawing/bitmaps/81773-interlaced.gif        \
        Test/System.Drawing/bitmaps/nature24bits.jpg    \
+       Test/System.Drawing/bitmaps/nature-greyscale.jpg        \
        Test/System.Drawing/bitmaps/smiley.ico  \
        Test/System.Drawing/bitmaps/VisualPng1.ico      \
        Test/System.Drawing/bitmaps/VisualPng.ico       \
@@ -45,6 +44,8 @@ EXTRA_DISTFILES = Test/resources/indexed.png  \
        Test/System.Drawing/bitmaps/96x96x256.ico       \
        Test/System.Drawing/bitmaps/32bpp.ico   \
        Test/System.Drawing/bitmaps/80509.ico   \
+       Test/System.Drawing/bitmaps/323511.ico  \
+       Test/System.Drawing/bitmaps/415581.ico  \
        Test/System.Drawing/bitmaps/non-inverted.bmp    \
        Test/System.Drawing/bitmaps/milkmateya01.emf    \
        Test/System.Drawing/bitmaps/telescope_01.wmf    \
@@ -58,4 +59,5 @@ EXTRA_DISTFILES = Test/resources/indexed.png  \
        Assembly/Warning.ico            \
        Assembly/WinLogo.ico            \
        Assembly/Mono.ico               \
+       Assembly/Shield.ico             \
        nunit-host-ignore-list