Merge pull request #819 from brendanzagaeski/patch-1

[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 64828ca77fd90275a87e7751aca05e9372951f41..d8e93372f455a7ed6d829a1ae0b9c51a3e9906c7 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Makefile
+++ b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -1,27 +1,48 @@
 thisdir = class/Microsoft.Build.Tasks
-SUBDIRS = 
+SUBDIRS =
 include ../../build/rules.make
 
+XBUILD_DIR=$(topdir)/tools/xbuild
+include $(XBUILD_DIR)/xbuild.make
+
 LIBRARY = Microsoft.Build.Tasks.dll
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Microsoft.Build.Tasks.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
-endif
+
+LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
 
 LIB_MCS_FLAGS = \
        /r:$(corlib)                            \
        /r:System.dll                           \
-       /r:System.Xml.dll                               \
+       /r:System.Core.dll                      \
+       /r:System.Xml.dll                       \
        /r:System.Windows.Forms.dll             \
-       /r:Microsoft.Build.Utilities.dll        \
-       /r:Microsoft.Build.Framework.dll
+       /r:$(XBUILD_UTILITIES)                  \
+       /r:$(XBUILD_FRAMEWORK)                  \
+       /r:$(XBUILD_ENGINE)                     \
+       /r:$(XBUILD_TASKS)
 
 TEST_MCS_FLAGS = \
-       /r:Microsoft.Build.Engine.dll           \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Tasks.dll            \
-       /r:Microsoft.Build.Utilities.dll
+       /r:$(XBUILD_ENGINE)     \
+       /r:$(XBUILD_FRAMEWORK)  \
+       /r:$(XBUILD_TASKS)      \
+       /r:$(XBUILD_UTILITIES)                  \
+       /r:System.Core.dll
+
+EXTRA_DISTFILES = \
+       Test/resources/test.cs \
+       Test/resources/Sample.cs \
+       Test/resources/Sample.vb \
+       Test/resources/junk.txt \
+       Test/test-config-file*
+
+Test/resources/test.dll: Test/resources/test.cs
+       $(CSCOMPILE) -target:library Test/resources/test.cs
+
+clean-test-resources:
+       rm -f Test/resources/test.dll
+
+test-local: Test/resources/test.dll
+
+clean-local: clean-test-resources
 
+include $(XBUILD_DIR)/xbuild_test.make
 include ../../build/library.make