Merge pull request #2819 from BrzVlad/fix-major-log

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

diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile
index d8e93372f455a7ed6d829a1ae0b9c51a3e9906c7..d451c754e74471c627da9bbd3e6ffd86fd871a90 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Makefile
+++ b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -9,23 +9,15 @@ LIBRARY = Microsoft.Build.Tasks.dll
 
 LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
 
-LIB_MCS_FLAGS = \
-       /r:$(corlib)                            \
-       /r:System.dll                           \
-       /r:System.Core.dll                      \
-       /r:System.Xml.dll                       \
-       /r:System.Windows.Forms.dll             \
-       /r:$(XBUILD_UTILITIES)                  \
-       /r:$(XBUILD_FRAMEWORK)                  \
-       /r:$(XBUILD_ENGINE)                     \
-       /r:$(XBUILD_TASKS)
-
-TEST_MCS_FLAGS = \
-       /r:$(XBUILD_ENGINE)     \
-       /r:$(XBUILD_FRAMEWORK)  \
-       /r:$(XBUILD_TASKS)      \
-       /r:$(XBUILD_UTILITIES)                  \
-       /r:System.Core.dll
+LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(PARENT_PROFILE)System.Windows.Forms \
+                       $(XBUILD_UTILITIES) $(XBUILD_FRAMEWORK) $(XBUILD_ENGINE) $(XBUILD_TASKS)
+
+TEST_MCS_FLAGS =
+TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core
+
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+TEST_LIB_REFS += Microsoft.Build
+endif
 
 EXTRA_DISTFILES = \
        Test/resources/test.cs \
@@ -35,7 +27,7 @@ EXTRA_DISTFILES = \
        Test/test-config-file*
 
 Test/resources/test.dll: Test/resources/test.cs
-       $(CSCOMPILE) -target:library Test/resources/test.cs
+       $(CSCOMPILE) -target:library /out:$@ $<
 
 clean-test-resources:
        rm -f Test/resources/test.dll