Merge pull request #1949 from lewurm/fixtype

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

diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile
index 2d194904bb11e474f6541782ad4d003e8228ff88..5f96dcbd7d74342addcad0c839086b229abfd4e6 100644 (file)
--- a/mcs/class/System.Xaml/Makefile
+++ b/mcs/class/System.Xaml/Makefile
@@ -5,23 +5,17 @@ include ../../build/rules.make
 RESOURCE_FILES = 
 
 LIBRARY = System.Xaml.dll
-LIB_MCS_FLAGS = \
-               /r:System.dll \
-               /r:System.Xml.dll \
-               /r:System.Core.dll \
-               $(RESOURCE_FILES:%=/resource:%)
-
-ifneq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += /r:System.Configuration.dll
-endif
+LIB_REFS = System System.Xml System.Core
+LIB_MCS_FLAGS = $(RESOURCE_FILES:%=/resource:%)
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_EXTRA_DISTFILES)
 TEST_EXTRA_DISTFILES = \
-       Test/XmlFiles/*.xml
+       Test/XmlFiles/*.xml \
+       Test/XmlFiles/*.xaml
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xaml.dll
 NO_INSTALL = yes