From 20aa3a7d6585242f5e18bcaba68d4dc8338d4e56 Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Tue, 16 Jul 2024 08:45:10 +0000 Subject: [PATCH] makefile: turn off forced tracing - use option (--trace and or --debug) to trace makefile execution --- Source/HBIOS/Makefile | 14 +++++++------- Source/Makefile | 4 ++-- Tools/Makefile | 2 +- Tools/Makefile.inc | 30 +++++++++++++++--------------- Tools/unix/Makefile | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index d684aa1f..97910740 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -18,7 +18,7 @@ endif ifeq ($(OBJECTS),) start: - chmod +x Build.sh + @chmod +x Build.sh bash Build.sh $(DIFFBUILD) endif @@ -59,7 +59,7 @@ ROMNAME=${ROM_PLATFORM}_${ROM_CONFIG} # $(info TASM=$(TASM)) $(OBJECTS) : $(ROMDEPS) - cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin ../CPM22/cpm_$(BIOS).bin >osimg.bin + @cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin ../CPM22/cpm_$(BIOS).bin >osimg.bin cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin >osimg_small.bin if [ $(ROM_PLATFORM) != UNA ] ; then \ cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin usrrom.bin >osimg1.bin ; \ @@ -104,19 +104,19 @@ tastybasic.bin: cp ../TastyBasic/src/$@ . hbios_rom.bin: hbios.asm build.inc $(DEPS) - $(TASM) -dROMBOOT hbios.asm hbios_rom.bin hbios_rom.lst + @$(TASM) -dROMBOOT hbios.asm hbios_rom.bin hbios_rom.lst hbios_app.bin: hbios.asm build.inc $(DEPS) - $(TASM) -dAPPBOOT hbios.asm hbios_app.bin hbios_app.lst + @$(TASM) -dAPPBOOT hbios.asm hbios_app.bin hbios_app.lst hbios_img.bin: hbios.asm build.inc $(DEPS) - $(TASM) -dIMGBOOT hbios.asm hbios_img.bin hbios_img.lst + @$(TASM) -dIMGBOOT hbios.asm hbios_img.bin hbios_img.lst hbios_env.com: hbios_env.asm build.inc - $(TASM) -dBASH hbios_env.asm hbios_env.com hbios_env.lst + @$(TASM) -dBASH hbios_env.asm hbios_env.com hbios_env.lst hbios_env.sh: hbios_env.com - $(ZXCC) hbios_env.com >hbios_env.sh + @$(ZXCC) hbios_env.com >hbios_env.sh romldr.bin: build.inc dbgmon.bin: build.inc diff --git a/Source/Makefile b/Source/Makefile index ea0bd77f..add7330d 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -5,7 +5,7 @@ .PHONY: doc prop shared bp images rom zrc z1rcc zzrcc zrc512 .ONESHELL: -.SHELLFLAGS = -cex +.SHELLFLAGS = -ce all: prop shared bp images rom zrc z1rcc zzrcc zrc512 @@ -40,7 +40,7 @@ images: $(MAKE) --directory Images $(ACTION) rom: - $(MAKE) --directory HBIOS $(ACTION) + @$(MAKE) --directory HBIOS $(ACTION) zrc: $(MAKE) --directory ZRC $(ACTION) diff --git a/Tools/Makefile b/Tools/Makefile index 74baac9a..a4bbdb71 100644 --- a/Tools/Makefile +++ b/Tools/Makefile @@ -3,7 +3,7 @@ # .ONESHELL: -.SHELLFLAGS = -cex +.SHELLFLAGS = -ce UNAME := $(shell uname) diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc index 10be67c5..a541305c 100644 --- a/Tools/Makefile.inc +++ b/Tools/Makefile.inc @@ -56,7 +56,7 @@ CPM=$(TOOLS)/cpm/bin80/ # exit if any command returns a non-zero result ("x"). # .ONESHELL: -.SHELLFLAGS = -cex +.SHELLFLAGS = -ce %.com: %.asm @if [ "$(USETASM)" = 1 ] ; then \ @@ -70,52 +70,52 @@ CPM=$(TOOLS)/cpm/bin80/ fi %.rom: %.asm - $(TASM) $(TASMFLAGS) $< $@ $*.lst + @$(TASM) $(TASMFLAGS) $< $@ $*.lst %.hex: %.asm - $(ZXCC) $(CPM)/MAC -$< -$$PO + @$(ZXCC) $(CPM)/MAC -$< -$$PO %.bin: %.ASM - $(ZXCC) $(CPM)/MAC -$< -$$PO + @$(ZXCC) $(CPM)/MAC -$< -$$PO $(ZXCC) $(CPM)/MLOAD25 -tmp.bin=$*.hex mv tmp.bin $@ rm -f /tmp/casefn.cache rm -f $$($(CASEFN) $*.hex) %.com: %.z80 - $(ZXCC) $(CPM)/Z80ASM -$(basename $<)/F + @$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/F rm -f /tmp/casefn.cache mv $$($(CASEFN) $@) tmp.com ; mv tmp.com $@ %.bin: %.asm - $(TASM) $(TASMFLAGS) $< $@ $(basename $<).lst + @$(TASM) $(TASMFLAGS) $< $@ $(basename $<).lst %.rel: %.asm - $(ZXCC) $(CPM)/RMAC -$< + @$(ZXCC) $(CPM)/RMAC -$< %.rel: %.z80 - $(ZXCC) $(CPM)/Z80ASM -$(basename $<)/MF + @$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/MF #%.hex: %.z80 -# $(ZXCC) $(CPM)/Z80ASM -$(basename $<)/HF +# @$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/HF %.hex: %.z80 - $(ZXCC) $(CPM)/SLR180 -$(basename $<)/HF + @$(ZXCC) $(CPM)/SLR180 -$(basename $<)/HF %.rel: %.azm - $(ZXCC) $(CPM)/ZSM =$< -/L + @$(ZXCC) $(CPM)/ZSM =$< -/L %.bin: %.rel - $(ZXCC) $(CPM)/LINK -$@=$< + @$(ZXCC) $(CPM)/LINK -$@=$< %.rel: %.mac - $(ZXCC) $(CPM)/M80 -=$(basename $<) + @$(ZXCC) $(CPM)/M80 -=$(basename $<) %.com: %.rel - $(ZXCC) $(CPM)/L80 -$(basename $<),$(basename $<).com/n/e + @$(ZXCC) $(CPM)/L80 -$(basename $<),$(basename $<).com/n/e %.eeprom: %.spin - $(OPENSPIN) -e $< + @$(OPENSPIN) -e $< # # first target is default diff --git a/Tools/unix/Makefile b/Tools/unix/Makefile index ebdecfb5..7cefdb27 100644 --- a/Tools/unix/Makefile +++ b/Tools/unix/Makefile @@ -3,7 +3,7 @@ # .ONESHELL: -.SHELLFLAGS = -cex +.SHELLFLAGS = -ce UNAME := $(shell uname) ifeq ($(UNAME), Linux) @@ -20,4 +20,4 @@ all: @$(foreach subdir,$(SUBDIRS),$(MAKE) --directory $(subdir) all;) clean: - @$(foreach subdir,$(SUBDIRS),$(MAKE) --directory $(subdir) clean;) \ No newline at end of file + @$(foreach subdir,$(SUBDIRS),$(MAKE) --directory $(subdir) clean;)