Merge pull request #801 from Ninds/master

[mono.git] / mcs / class / Microsoft.Build.Utilities / Makefile

diff --git a/mcs/class/Microsoft.Build.Utilities/Makefile b/mcs/class/Microsoft.Build.Utilities/Makefile
index 5cee6a15373b06f007e5f72e4008c5b170453f7f..585e5bb0a4f3e0eff7b65d00b3d29fdfec61a96c 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Makefile
+++ b/mcs/class/Microsoft.Build.Utilities/Makefile
@@ -3,18 +3,26 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = Microsoft.Build.Utilities.dll
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Microsoft.Build.Utilities.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
+BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
+
+ifeq (3.5, $(FRAMEWORK_VERSION))
+LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
+BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
+else
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIBRARY_NAME = Microsoft.Build.Utilities.v4.0.dll
+endif
 endif
 
 LIB_MCS_FLAGS = \
        /r:$(corlib)                            \
        /r:System.dll                           \
-       /r:Microsoft.Build.Framework.dll
+       /r:$(BUILD_FRAMEWORK)
+
+TEST_MCS_FLAGS = /r:$(BUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll
 
-TEST_MCS_FLAGS = /r:Microsoft.Build.Framework.dll
+export TESTING_MONO=a
+XBUILD_DIR=../../tools/xbuild
+include $(XBUILD_DIR)/xbuild_targets.make
 
 include ../../build/library.make