Update Makefile to fix concurrancy issues with libppetracepp.a

    -There is a race condition when  building and linking
     ppetracepp.exe it is a dependancy for multiple items
     being build.  This change makes ppetrace.exe a pre-req
     for the 'all' target which will force that executable
     and libppetraceppe.a to be build before any others.
    -Remove the code in cc.rules.mk which was removing the
     .a file before recreating it.

Fixes open-power/hcode#2

Change-Id: Ic991f757eba4958abcb0e34f1cf02e0202b9dc62

2 files changed, 14 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 47d6af06..5c95abe0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2017
+# COPYRIGHT 2017,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -24,12 +24,21 @@
 # IBM_PROLOG_END_TAG
 export BASEPATH=../..
 BUILD_DIR = tools/build
-.PHONY: install all clean install_rings
+.PHONY: install all clean
 
-install: all install_rings
+install: all
 
-all: install_rings
+TOOLS = ppetracepp
+
+# ppetrace.exe is a dependancy for several independent
+# targets, build it first to eliminate concurrancy
+# issues
+all: $(TOOLS)
 	@$(MAKE) -C $(BUILD_DIR) all --no-print-directory
 
 clean:
 	@$(MAKE) -C $(BUILD_DIR) clean  --no-print-directory
+
+%:
+	@$(MAKE) -C $(BUILD_DIR) $@  --no-print-directory
+
diff --git a/tools/build/rules.dir/cc.rules.mk b/tools/build/rules.dir/cc.rules.mk
index 173a1fdb..2f37353a 100644
--- a/tools/build/rules.dir/cc.rules.mk
+++ b/tools/build/rules.dir/cc.rules.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HCODE Project
 #
-# COPYRIGHT 2015,2017
+# COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -100,7 +100,6 @@ else
 		$(C2) "    AR$(1)     $$(@F)"
 endif
 		$(C1) mkdir -p $$(@D)
-		$(C1) rm -f $$@
 		$(C1) $$($(1)_PREFIX)$$(AR) rcs $$@ $$^
 endef