From 8a2052cc523baaca4189ff86e2f55b2e11efa059 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 16 Oct 2014 14:10:17 -0700 Subject: [PATCH] Fix builds/msvc/Makefile.am to include all properties files in the build I attempted to fix up the properties files manifests in the Makefile, but neglected the end-of-line escape characters. It was good enough to pass whatever make dist on Linux did, but I had no Windows build env to test in. The broken change was in commit de4a442. Signed-off-by: Dan Mick --- builds/msvc/Makefile.am | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index e960c39a..078c1eb7 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -72,29 +72,29 @@ PERF_DIST = vs2008/local_lat/local_lat.vcproj \ vs2013/inproc_lat/inproc_lat.props \ vs2013/inproc_thr/inproc_thr.props -PROPERTIES_DIST = properties/Common.props - properties/DebugDEXE.props - properties/DebugDLL.props - properties/DebugLEXE.props - properties/DebugLIB.props - properties/DebugLTCG.props - properties/Debug.props - properties/DebugSEXE.props - properties/DLL.props - properties/EXE.props - properties/LIB.props - properties/Link.props - properties/LTCG.props - properties/Messages.props - properties/Output.props - properties/ReleaseDEXE.props - properties/ReleaseDLL.props - properties/ReleaseLEXE.props - properties/ReleaseLIB.props - properties/ReleaseLTCG.props - properties/Release.props - properties/ReleaseSEXE.props - properties/Win32.props +PROPERTIES_DIST = properties/Common.props \ + properties/DebugDEXE.props \ + properties/DebugDLL.props \ + properties/DebugLEXE.props \ + properties/DebugLIB.props \ + properties/DebugLTCG.props \ + properties/Debug.props \ + properties/DebugSEXE.props \ + properties/DLL.props \ + properties/EXE.props \ + properties/LIB.props \ + properties/Link.props \ + properties/LTCG.props \ + properties/Messages.props \ + properties/Output.props \ + properties/ReleaseDEXE.props \ + properties/ReleaseDLL.props \ + properties/ReleaseLEXE.props \ + properties/ReleaseLIB.props \ + properties/ReleaseLTCG.props \ + properties/Release.props \ + properties/ReleaseSEXE.props \ + properties/Win32.props \ properties/x64.props PRECOMPILED_DIST = ../../src/precompiled.hpp \