From 9fcf353734130efbf1ea15b9314ca856c3be4e06 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 8 Aug 2023 11:53:36 +1200
Subject: [PATCH] Makefile adjustments to match top make

Hopefully matches enough that any `make docs` call will work from the yosys being built, while still being overridable locally.
---
 docs/resources/PRESENTATION_ExAdv/Makefile |  4 +++-
 docs/resources/PRESENTATION_ExOth/Makefile |  4 +++-
 docs/resources/PRESENTATION_ExSyn/Makefile |  6 +++++-
 docs/resources/PRESENTATION_Intro/Makefile |  5 ++++-
 docs/resources/PRESENTATION_Prog/Makefile  | 15 +++++++++------
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/docs/resources/PRESENTATION_ExAdv/Makefile b/docs/resources/PRESENTATION_ExAdv/Makefile
index 8954ee254..fc6ba6902 100644
--- a/docs/resources/PRESENTATION_ExAdv/Makefile
+++ b/docs/resources/PRESENTATION_ExAdv/Makefile
@@ -1,4 +1,6 @@
-YOSYS = ../../../yosys
+PROGRAM_PREFIX :=
+
+YOSYS ?= ../../../$(PROGRAM_PREFIX)yosys
 
 all: select.pdf red_or3x1.pdf sym_mul.pdf mymul.pdf mulshift.pdf addshift.pdf \
 		macc_simple_xmap.pdf macc_xilinx_xmap.pdf
diff --git a/docs/resources/PRESENTATION_ExOth/Makefile b/docs/resources/PRESENTATION_ExOth/Makefile
index 4291f9976..afd84c3c6 100644
--- a/docs/resources/PRESENTATION_ExOth/Makefile
+++ b/docs/resources/PRESENTATION_ExOth/Makefile
@@ -1,4 +1,6 @@
-YOSYS = ../../../yosys
+PROGRAM_PREFIX :=
+
+YOSYS ?= ../../../$(PROGRAM_PREFIX)yosys
 
 all: scrambler_p01.pdf scrambler_p02.pdf equiv.log axis_test.log
 
diff --git a/docs/resources/PRESENTATION_ExSyn/Makefile b/docs/resources/PRESENTATION_ExSyn/Makefile
index e9986ff05..a9015e8d5 100644
--- a/docs/resources/PRESENTATION_ExSyn/Makefile
+++ b/docs/resources/PRESENTATION_ExSyn/Makefile
@@ -5,11 +5,15 @@ TARGETS += memory_01 memory_02
 TARGETS += techmap_01
 TARGETS += abc_01
 
+PROGRAM_PREFIX :=
+
+YOSYS ?= ../../../$(PROGRAM_PREFIX)yosys
+
 all: $(addsuffix .pdf,$(TARGETS))
 
 define make_pdf_template
 $(1).pdf: $(1)*.v $(1)*.ys
-	../../../yosys -p 'script $(1).ys; show -notitle -prefix $(1) -format pdf'
+	$(YOSYS) -p 'script $(1).ys; show -notitle -prefix $(1) -format pdf'
 endef
 
 $(foreach trg,$(TARGETS),$(eval $(call make_pdf_template,$(trg))))
diff --git a/docs/resources/PRESENTATION_Intro/Makefile b/docs/resources/PRESENTATION_Intro/Makefile
index 48946f1e1..2c5fdcf4c 100644
--- a/docs/resources/PRESENTATION_Intro/Makefile
+++ b/docs/resources/PRESENTATION_Intro/Makefile
@@ -1,8 +1,11 @@
+PROGRAM_PREFIX :=
+
+YOSYS ?= ../../../$(PROGRAM_PREFIX)yosys
 
 all: counter_00.dot counter_01.dot counter_02.dot counter_03.dot
 
 counter_00.dot: counter.v counter.ys mycells.lib
-	../../../yosys counter_outputs.ys
+	$(YOSYS) counter_outputs.ys
 
 counter_01.dot: counter_00.dot
 counter_02.dot: counter_00.dot
diff --git a/docs/resources/PRESENTATION_Prog/Makefile b/docs/resources/PRESENTATION_Prog/Makefile
index 2ac8e5bed..60ca513a8 100644
--- a/docs/resources/PRESENTATION_Prog/Makefile
+++ b/docs/resources/PRESENTATION_Prog/Makefile
@@ -1,21 +1,24 @@
+PROGRAM_PREFIX :=
+
+YOSYS ?= ../../../$(PROGRAM_PREFIX)yosys
 
 all: test0.log test1.log test2.log
 
-CXXFLAGS=$(shell ../../yosys-config --cxxflags)
-DATDIR=$(shell ../../yosys-config --datdir)
+CXXFLAGS=$(shell $(YOSYS)-config --cxxflags)
+DATDIR=$(shell $(YOSYS)-config --datdir)
 
 my_cmd.so: my_cmd.cc
-	../../yosys-config --exec --cxx $(subst $(DATDIR),../../share,$(CXXFLAGS)) --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
+	$(YOSYS)-config --exec --cxx $(subst $(DATDIR),../../share,$(CXXFLAGS)) --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
 
 test0.log: my_cmd.so
-	../../yosys -Ql test0.log_new -m ./my_cmd.so -p 'my_cmd foo bar' absval_ref.v
+	$(YOSYS) -Ql test0.log_new -m ./my_cmd.so -p 'my_cmd foo bar' absval_ref.v
 	mv test0.log_new test0.log
 
 test1.log: my_cmd.so
-	../../yosys -Ql test1.log_new -m ./my_cmd.so -p 'clean; test1; dump' absval_ref.v
+	$(YOSYS) -Ql test1.log_new -m ./my_cmd.so -p 'clean; test1; dump' absval_ref.v
 	mv test1.log_new test1.log
 
 test2.log: my_cmd.so
-	../../yosys -Ql test2.log_new -m ./my_cmd.so -p 'hierarchy -top test; test2' sigmap_test.v
+	$(YOSYS) -Ql test2.log_new -m ./my_cmd.so -p 'hierarchy -top test; test2' sigmap_test.v
 	mv test2.log_new test2.log