From c6a750b0e08bb8232ad07ad52a9b36b74ce2bed2 Mon Sep 17 00:00:00 2001
From: Michael W Powell <mwpowellhtx@gmail.com>
Date: Tue, 7 Mar 2017 11:25:32 -0500
Subject: [PATCH] commit focused on renaming to diff tool friendly file names

---
 Makefile                                                     | 5 +++--
 ...akefile.third_party.unix => Makefile.third_party.unix.mk} | 0
 ...{Makefile.third_party.win => Makefile.third_party.win.mk} | 0
 makefiles/{Makefile.unix => Makefile.unix.mk}                | 0
 makefiles/{Makefile.win => Makefile.win.mk}                  | 0
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename makefiles/{Makefile.third_party.unix => Makefile.third_party.unix.mk} (100%)
 mode change 100755 => 100644
 rename makefiles/{Makefile.third_party.win => Makefile.third_party.win.mk} (100%)
 mode change 100755 => 100644
 rename makefiles/{Makefile.unix => Makefile.unix.mk} (100%)
 mode change 100755 => 100644
 rename makefiles/{Makefile.win => Makefile.win.mk} (100%)
 mode change 100755 => 100644

diff --git a/Makefile b/Makefile
index c7661c4386..3989f4ab3e 100755
--- a/Makefile
+++ b/Makefile
@@ -42,11 +42,12 @@ OR_ROOT_FULL=$(OR_TOOLS_TOP)
 # Load local variables
 include $(OR_ROOT)Makefile.local
 
+# Change the file extensions to increase diff tool friendliness.
 # Then include specific system commands and definitions
-include $(OR_ROOT)makefiles/Makefile.$(SYSTEM)
+include $(OR_ROOT)makefiles/Makefile.$(SYSTEM).mk
 
 # Rules to fetch and build third party dependencies.
-include $(OR_ROOT)makefiles/Makefile.third_party.$(SYSTEM)
+include $(OR_ROOT)makefiles/Makefile.third_party.$(SYSTEM).mk
 
 # Include .mk files.
 include $(OR_ROOT)makefiles/Makefile.cpp.mk
diff --git a/makefiles/Makefile.third_party.unix b/makefiles/Makefile.third_party.unix.mk
old mode 100755
new mode 100644
similarity index 100%
rename from makefiles/Makefile.third_party.unix
rename to makefiles/Makefile.third_party.unix.mk
diff --git a/makefiles/Makefile.third_party.win b/makefiles/Makefile.third_party.win.mk
old mode 100755
new mode 100644
similarity index 100%
rename from makefiles/Makefile.third_party.win
rename to makefiles/Makefile.third_party.win.mk
diff --git a/makefiles/Makefile.unix b/makefiles/Makefile.unix.mk
old mode 100755
new mode 100644
similarity index 100%
rename from makefiles/Makefile.unix
rename to makefiles/Makefile.unix.mk
diff --git a/makefiles/Makefile.win b/makefiles/Makefile.win.mk
old mode 100755
new mode 100644
similarity index 100%
rename from makefiles/Makefile.win
rename to makefiles/Makefile.win.mk