Merge pull request #926 from EvanLloyd/win_make_4

Minor makefile fixes

diff --cc Makefile
Simple merge

diff --cc make_helpers/build_macros.mk
Simple merge

diff --cc make_helpers/unix.mk
index 61b1368b2d4d44dd580d4e823f1aa6e9086c9ec2,6f7020080dd7f0fa8789cb631256fabfabd84135..17f8a7c279c7a6eed1401fb975ad84e7605e08bc
--- 1/make_helpers/unix.mk
--- 2/make_helpers/unix.mk
+++ b/make_helpers/unix.mk
@@@ -1,7 -1,31 +1,7 @@@
  #
- # Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ # Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
  #
 -# Redistribution and use in source and binary forms, with or without
 -# modification, are permitted provided that the following conditions are met:
 -#
 -# Redistributions of source code must retain the above copyright notice, this
 -# list of conditions and the following disclaimer.
 -#
 -# Redistributions in binary form must reproduce the above copyright notice,
 -# this list of conditions and the following disclaimer in the documentation
 -# and/or other materials provided with the distribution.
 -#
 -# Neither the name of ARM nor the names of its contributors may be used
 -# to endorse or promote products derived from this software without specific
 -# prior written permission.
 -#
 -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 -# POSSIBILITY OF SUCH DAMAGE.
 +# SPDX-License-Identifier: BSD-3-Clause
  #
  #
  

diff --cc make_helpers/windows.mk
index f6e8d55bdb5e19dc272f4c8ca148b1901ba3a189,5138d1b9ca2ac9211359c11a124b8d61baa49047..69f6a017158c90e04337dcbc0932a23662760d2b
--- 1/make_helpers/windows.mk
--- 2/make_helpers/windows.mk
+++ b/make_helpers/windows.mk
@@@ -1,7 -1,31 +1,7 @@@
  #
- # Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ # Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
  #
 -# Redistribution and use in source and binary forms, with or without
 -# modification, are permitted provided that the following conditions are met:
 -#
 -# Redistributions of source code must retain the above copyright notice, this
 -# list of conditions and the following disclaimer.
 -#
 -# Redistributions in binary form must reproduce the above copyright notice,
 -# this list of conditions and the following disclaimer in the documentation
 -# and/or other materials provided with the distribution.
 -#
 -# Neither the name of ARM nor the names of its contributors may be used
 -# to endorse or promote products derived from this software without specific
 -# prior written permission.
 -#
 -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 -# POSSIBILITY OF SUCH DAMAGE.
 +# SPDX-License-Identifier: BSD-3-Clause
  #
  #