Merge pull request #866 from linquize/content-type-encoding

[mono.git] / mcs / tools / xbuild / Makefile

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index f5a87b05af2ceb58b2ea90e3808523bd69576ba9..6b7753d8199dc5baa06134b7fd90e51ec6b0793d 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -31,8 +31,8 @@ install-bin-data:
        $(INSTALL_DATA) data/xbuild.rsp $(DESTDIR)$(XBUILD_BIN_DIR)
        $(INSTALL_DATA) data/$(XBUILD_VERSION)/Microsoft.Common.tasks $(DESTDIR)$(XBUILD_BIN_DIR)
        $(INSTALL_DATA) data/$(XBUILD_VERSION)/Microsoft.Common.targets $(DESTDIR)$(XBUILD_BIN_DIR)
+       $(INSTALL_DATA) data/$(XBUILD_VERSION)/Microsoft.CSharp.targets $(DESTDIR)$(XBUILD_BIN_DIR)
        $(INSTALL_DATA) data/Microsoft.Build.xsd $(DESTDIR)$(XBUILD_BIN_DIR)
-       $(INSTALL_DATA) data/Microsoft.CSharp.targets $(DESTDIR)$(XBUILD_BIN_DIR)
        $(INSTALL_DATA) data/Microsoft.VisualBasic.targets $(DESTDIR)$(XBUILD_BIN_DIR)
        $(INSTALL_DATA) data/MSBuild/Microsoft.Build.CommonTypes.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
        $(INSTALL_DATA) data/MSBuild/Microsoft.Build.Core.xsd $(DESTDIR)$(XBUILD_BIN_DIR)/MSBuild
@@ -45,12 +45,16 @@ install-frameworks:
        $(INSTALL_DATA) frameworks/net_3.0.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v3.0/RedistList/FrameworkList.xml
        $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/RedistList
        $(INSTALL_DATA) frameworks/net_4.0.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/Profile/Client/RedistList
+       $(INSTALL_DATA) frameworks/net_4.0_client.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.0/Profile/Client/RedistList/FrameworkList.xml
 
 install-pcl-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0
        $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.CSharp.targets
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5
        $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.CSharp.targets
+       $(INSTALL_DATA) targets/Microsoft.Portable.Core.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.targets
+       $(INSTALL_DATA) targets/Microsoft.Portable.Core.props $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.props
 
 install-web-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
@@ -67,20 +71,28 @@ EXTRA_DISTFILES = \
        data/2.0/Microsoft.Common.tasks \
        data/3.5/Microsoft.Common.tasks \
        data/4.0/Microsoft.Common.tasks \
+       data/12.0/Microsoft.Common.tasks \
        data/2.0/Microsoft.Common.targets \
        data/3.5/Microsoft.Common.targets \
        data/4.0/Microsoft.Common.targets \
-       data/Microsoft.CSharp.targets \
+       data/12.0/Microsoft.Common.targets \
+       data/2.0/Microsoft.CSharp.targets \
+       data/3.5/Microsoft.CSharp.targets \
+       data/4.0/Microsoft.CSharp.targets \
+       data/12.0/Microsoft.CSharp.targets \
+       data/Microsoft.VisualBasic.targets \
        data/MSBuild/Microsoft.Build.CommonTypes.xsd \
        data/MSBuild/Microsoft.Build.Core.xsd \
        frameworks/net_2.0.xml \
        frameworks/net_3.0.xml \
        frameworks/net_3.5.xml \
        frameworks/net_4.0.xml \
+       frameworks/net_4.0_client.xml \
        frameworks/net_4.5.xml \
        targets/Microsoft.Portable.CSharp_4.0.targets \
        targets/Microsoft.Portable.CSharp_4.5.targets \
-       targets/Microsoft.VisualBasic.targets \
+       targets/Microsoft.Portable.Core.targets \
+       targets/Microsoft.Portable.Core.props \
        targets/Microsoft.WebApplication.targets \
-       targets/Microsoft.Portable.CSharp.targets \
-       xbuild_tests.make
+       xbuild.make \
+       xbuild_test.make