From 853362671d67d2dd48f548e1bdc5940ba95dae4d Mon Sep 17 00:00:00 2001 From: Philip Zembrod Date: Sat, 2 Sep 2023 22:58:20 +0200 Subject: [PATCH] Straighten out patsubst expressions in rule dependencies --- 8080/CPM/Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile index 745d992..02f3ae0 100644 --- a/8080/CPM/Makefile +++ b/8080/CPM/Makefile @@ -38,8 +38,7 @@ run-volks4th: \ "volks4th" logtest.log: \ - $(patsubst %, $(cpmfilesdir)/%, volks4th.com) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/log2file.fb) \ + $(patsubst %, $(cpmfilesdir)/%, volks4th.com log2file.fb) \ | emu ./emulator/run-in-runcpm.sh \ "volks4th" \ @@ -56,10 +55,8 @@ logtest.log: \ dos2unix -n $(runcpmdir)/logfile.txt $@ inctest.log: \ - $(patsubst %, $(cpmfilesdir)/%, volks4th.com) \ - $(patsubst src/%, $(cpmfilesdir)/%, src/include.fb) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/log2file.fb) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/inctest.fth) \ + $(patsubst %, $(cpmfilesdir)/%, volks4th.com \ + include.fb log2file.fb inctest.fth) \ | emu ./emulator/run-in-runcpm.sh \ "volks4th" \ @@ -73,14 +70,9 @@ inctest.log: \ dos2unix -n $(runcpmdir)/logfile.txt $@ test-min.log: \ - $(patsubst %, $(cpmfilesdir)/%, volks4th.com) \ - $(patsubst src/%, $(cpmfilesdir)/%, src/include.fb) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/log2file.fb) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/ans-shim.fth) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/prelim.fth) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/tester.fth) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/core.fr) \ - $(patsubst tests/%, $(cpmfilesdir)/%, tests/test-min.fth) \ + $(patsubst %, $(cpmfilesdir)/%, volks4th.com \ + include.fb log2file.fb \ + ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \ | emu ./emulator/run-in-runcpm.sh \ "volks4th" \