From 022b98a64baef878f9be441b5a43c765953fe062 Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Sun, 29 Sep 2024 23:14:19 -0700 Subject: [PATCH] Update all iterative makes to use --- benchmarks/coremark/Makefile | 4 ++-- fpga/zsbl/Makefile | 2 +- tests/custom/boot/Makefile | 2 +- tests/custom/fpga-blink-led/Makefile | 2 +- tests/custom/fpga-test-dram/Makefile | 2 +- tests/custom/fpga-test-sdc/Makefile | 2 +- tests/custom/spitest/Makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile index 63afc34bf..a999e70f3 100644 --- a/benchmarks/coremark/Makefile +++ b/benchmarks/coremark/Makefile @@ -37,14 +37,14 @@ $(work_dir)/coremark.bare.riscv.elf.memfile: $(work_dir)/coremark.bare.riscv extractFunctionRadix.sh $<.elf.objdump $(work_dir)/coremark.bare.riscv: $(sources) Makefile - make -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=$(RISCV) XCFLAGS="$(PORT_CFLAGS)" + $(MAKE) -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=$(RISCV) XCFLAGS="$(PORT_CFLAGS)" mkdir -p $(work_dir) mv $(cmbase)/coremark.bare.riscv $(work_dir) .PHONY: clean clean: - make -C $(cmbase) clean + $(MAKE) -C $(cmbase) clean rm -f $(work_dir)/* diff --git a/fpga/zsbl/Makefile b/fpga/zsbl/Makefile index 9d962d430..8ba2b84d2 100644 --- a/fpga/zsbl/Makefile +++ b/fpga/zsbl/Makefile @@ -64,7 +64,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif diff --git a/tests/custom/boot/Makefile b/tests/custom/boot/Makefile index d4ebaa7f7..fb3b62c7e 100644 --- a/tests/custom/boot/Makefile +++ b/tests/custom/boot/Makefile @@ -57,7 +57,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif diff --git a/tests/custom/fpga-blink-led/Makefile b/tests/custom/fpga-blink-led/Makefile index 3ccf1927d..8bfbe000b 100644 --- a/tests/custom/fpga-blink-led/Makefile +++ b/tests/custom/fpga-blink-led/Makefile @@ -55,7 +55,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif diff --git a/tests/custom/fpga-test-dram/Makefile b/tests/custom/fpga-test-dram/Makefile index 3ccf1927d..8bfbe000b 100644 --- a/tests/custom/fpga-test-dram/Makefile +++ b/tests/custom/fpga-test-dram/Makefile @@ -55,7 +55,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif diff --git a/tests/custom/fpga-test-sdc/Makefile b/tests/custom/fpga-test-sdc/Makefile index a5e24a56e..42d227692 100644 --- a/tests/custom/fpga-test-sdc/Makefile +++ b/tests/custom/fpga-test-sdc/Makefile @@ -55,7 +55,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif diff --git a/tests/custom/spitest/Makefile b/tests/custom/spitest/Makefile index 34e83a9e4..d8aa42567 100644 --- a/tests/custom/spitest/Makefile +++ b/tests/custom/spitest/Makefile @@ -55,7 +55,7 @@ LIBS+=${LIBRARY_DIRS:%=-L%} ${LIBRARY_FILES:%=-l%} INC+=${LIBRARY_DIRS:%=-I%} ${LIBRARY_DIRS}: - make -C $@ -j 1 + $(MAKE) -C $@ -j 1 .PHONY: $(LIBRARY_DIRS) $(TARGET) endif