From 9f15687b0320d27f9c102d488265c47ce890f0d9 Mon Sep 17 00:00:00 2001
From: Willy De la Court <wdl1908@gmail.com>
Date: Thu, 10 Jul 2025 19:37:10 +0200
Subject: [PATCH 1/3] Make sure the images in *.def files are build as
 dependencies

---
 Source/Images/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index abfe97d7..1bf87517 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -41,6 +41,11 @@ TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP))
 TEMP := $(TEMP:.def=.img)
 OBJECTS += $(TEMP)
 
+TEMP = $(shell grep -vEh "^\#" *.def)
+TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP))
+TEMP := $(addsuffix .img,$(TEMP))
+OBJECTS += $(TEMP)
+
 
 OTHERS = blank144 blankhd512 blankhd1k *.cat
 

From 7f64871014f15b1f2ed4e12aa8ef29351f405455 Mon Sep 17 00:00:00 2001
From: Willy De la Court <wdl1908@gmail.com>
Date: Thu, 10 Jul 2025 20:19:06 +0200
Subject: [PATCH 2/3] Use TEMP2 as variable to not create conflict with
 previous use of TEMP

---
 Source/Images/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index 1bf87517..38d0ccd6 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -41,10 +41,10 @@ TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP))
 TEMP := $(TEMP:.def=.img)
 OBJECTS += $(TEMP)
 
-TEMP = $(shell grep -vEh "^\#" *.def)
-TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP))
-TEMP := $(addsuffix .img,$(TEMP))
-OBJECTS += $(TEMP)
+TEMP2 = $(shell grep -vEh "^\#" *.def)
+TEMP2 := $(addprefix hd512_,$(TEMP2)) $(addprefix hd1k_,$(TEMP2))
+TEMP2 := $(addsuffix .img,$(TEMP2))
+OBJECTS += $(TEMP2)
 
 
 OTHERS = blank144 blankhd512 blankhd1k *.cat

From 7d72d8c3473e1f791daf2da08327150846a5fc33 Mon Sep 17 00:00:00 2001
From: Willy De la Court <wdl1908@gmail.com>
Date: Thu, 10 Jul 2025 21:01:53 +0200
Subject: [PATCH 3/3] rename VAR and not sure why but order is important

---
 Source/Images/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index a4c11883..064e9842 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -36,16 +36,18 @@ OBJECTS += $(HD1KIMGS) $(HD1KXIMGS) $(HD1KPREFIX)
 
 # OBJECTS =
 
+# add base images used in *.def files
+
+BASEIMG = $(shell grep -vEh "^\#" *.def)
+BASEIMG := $(addprefix hd512_,$(BASEIMG)) $(addprefix hd1k_,$(BASEIMG))
+BASEIMG := $(addsuffix .img,$(BASEIMG))
+OBJECTS += $(BASEIMG)
+
 TEMP = $(wildcard *.def)
 TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP))
 TEMP := $(TEMP:.def=.img)
 OBJECTS += $(TEMP)
 
-TEMP2 = $(shell grep -vEh "^\#" *.def)
-TEMP2 := $(addprefix hd512_,$(TEMP2)) $(addprefix hd1k_,$(TEMP2))
-TEMP2 := $(addsuffix .img,$(TEMP2))
-OBJECTS += $(TEMP2)
-
 
 OTHERS = blank144 blankhd512 blankhd1k *.cat