From 2809ba5b6dc4d018dc331d09004e591f4160e498 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 27 Jul 2021 12:10:33 -0700 Subject: [PATCH] More Make and Build Tweaks --- Makefile | 1 - Source/HBIOS/Build.sh | 6 +++--- Tools/Makefile.inc | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f4c60c14..40ad2bcd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ all: - echo SHELL=$(SHELL) $(MAKE) --directory Tools/unix $(MAKE) --directory Source diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index 36732cce..4f4b9544 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -59,6 +59,9 @@ fi outdir=../../Binary +# Help make realize that build.inc has changed +sleep 1 + cat <<- EOF > build.inc ; RomWBW Configured for $platform $config $timestamp ; @@ -98,6 +101,3 @@ else cat hbios_rom.bin osimg.bin osimg1.bin osimg2.bin >$romname.upd cat hbios_app.bin osimg_small.bin > $romname.com fi - -# make sure everything is rebuilt on subsequent iterations -rm -f hbios_*.bin diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc index 675535b9..32ad2bb0 100644 --- a/Tools/Makefile.inc +++ b/Tools/Makefile.inc @@ -123,7 +123,6 @@ endif # first target is default # all:: $(OBJECTS) - echo SHELL=$(SHELL) @for dir in $(SUBDIRS) ; do \ $(MAKE) --directory $$dir all ; \ done