From 1f22d60160e6850b7948a927f96a7c275e4bf94a Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Tue, 18 Feb 2020 18:47:17 -0800
Subject: [PATCH] Fix up Makefile dependences.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 Makefile                       | 10 +++++-----
 fuzzers/Makefile               | 27 ++++++++++++++++++---------
 minitests/roi_harness/Makefile |  5 ++++-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 5a93e0bf..915ed776 100644
--- a/Makefile
+++ b/Makefile
@@ -175,20 +175,20 @@ db-extras-artix7-harness:
 	+source minitests/roi_harness/arty-uart.sh && $(MAKE) -C fuzzers roi_only
 	+source minitests/roi_harness/basys3-swbut.sh && \
 		$(MAKE) -C minitests/roi_harness \
-			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut run
+			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut copy
 	+source minitests/roi_harness/basys3-swbut.sh && \
 		$(MAKE) -C minitests/roi_harness \
 			XRAY_ROIV=../roi_base_div2.v \
-			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 run
+			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 copy
 	+source minitests/roi_harness/arty-uart.sh && \
 		$(MAKE) -C minitests/roi_harness \
-			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/uart run
+			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/uart copy
 	+source minitests/roi_harness/arty-pmod.sh && \
 		$(MAKE) -C minitests/roi_harness \
-			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/pmod run
+			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/pmod copy
 	+source minitests/roi_harness/arty-swbut.sh && \
 		$(MAKE) -C minitests/roi_harness \
-			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut run
+			HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut copy
 
 db-extras-kintex7-parts:
 	@true
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index c9566a1c..dd4cb8c2 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -19,6 +19,12 @@ clean_locks:
 clean_piplists:
 	rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
 
+fuzzer_ok:
+	mkdir -p fuzzer_ok
+
+clean_fuzzers::
+	rm -rf fuzzer_ok
+
 define fuzzer
 
 # $(1) - Fuzzer name/directory
@@ -48,12 +54,12 @@ ifeq ($(VERBOSE),Y)
 # When verbose we just call make directory
 ifeq ($(3),Y)
 
-$(1)/run.$(XRAY_PART).ok: $(addprefix fuzzer_, $(2))
+$(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
 	$$(MAKE) -C $(1) run
 
 else
 
-$(1)/run.ok: $(addprefix fuzzer_, $(2))
+$(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
 	$$(MAKE) -C $(1) run
 
 endif
@@ -64,30 +70,33 @@ else
 # to log files.
 ifeq ($(3),Y)
 
-$(1)/run.$(XRAY_PART).ok: $(addprefix fuzzer_, $(2))
+$(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
 	+@$(SELF_DIR)/run_fuzzer.py $(1)
 
 else
 
-$(1)/run.ok: $(addprefix fuzzer_, $(2))
+$(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
 	+@$(SELF_DIR)/run_fuzzer.py $(1)
 
 endif
 
 endif
 
-.PHONY:: fuzzer_$(1)
-
 ifeq ($(3),Y)
 
-fuzzer_$(1): $(1)/run.$(XRAY_PART).ok
+fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.$(XRAY_PART).ok fuzzer_ok
+	touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
 
 else
 
-fuzzer_$(1): $(1)/run.ok
+fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.ok fuzzer_ok
+	touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
 
 endif
 
+.PHONY: fuzzer_$(1)
+
+fuzzer_$(1): fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
 
 endef
 
@@ -177,4 +186,4 @@ roi_only: 000-init-db/run.${XRAY_PART}.ok 001-part-yaml/run.${XRAY_PART}.ok 075-
 	cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json
 	cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tileconn.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json
 
-.PHONY:: all clean clean_fuzzers clean_logs quick part_only roi_only
+.PHONY: all clean clean_fuzzers clean_logs quick part_only roi_only
diff --git a/minitests/roi_harness/Makefile b/minitests/roi_harness/Makefile
index b7a4d040..ac6a9f70 100644
--- a/minitests/roi_harness/Makefile
+++ b/minitests/roi_harness/Makefile
@@ -14,9 +14,12 @@ $(BUILD_DIR)/run.ok: runme.sh runme.tcl
 	./runme.sh
 	touch $(BUILD_DIR)/run.ok
 
-copy: $(BUILD_DIR)/run.ok
+$(BUILD_DIR)/copy.ok: $(BUILD_DIR)/run.ok
 	mkdir -p $(HARNESS_DIR)
 	cp $(HARNESS_FILES) $(HARNESS_DIR)
+	touch $(BUILD_DIR)/copy.ok
+
+copy: $(BUILD_DIR)/copy.ok
 
 clean:
 	rm -rf build_* harness_*