diff --git a/Makefile b/Makefile index bbec2f3..471bc03 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ BOOT_CODE=boot_code/brainfuck_mandelbrot.txt GTKWSAVE=./gtkwave_savefile.gtkw MICROCODE=system/ucode.txt BOOTABLES=boot_code/brainfuck_compiled.txt boot_code/brainfuck_interpreted.txt boot_code/pipeline_ideal.txt boot_code/fibonacci.txt boot_code/gnome_sort.txt boot_code/cache_fill_and_empty.txt ${BOOT_CODE} boot_code/colored_led.txt boot_code/bios.stxt +PRINT_PATH_PREFIX=. NO_ASM=1 include common.mk @@ -30,23 +31,23 @@ include common.mk .PHONY: ${subst .txt,.bin,${BOOTABLES}} ${BOOTABLES} ${subst .stxt,.bin,${subst .txt,.bin,${BOOTABLES}}} : - ${Q}make ${MAKEOPTS} -C boot_code $(subst boot_code/,,$@) + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=boot_code/ -C boot_code $(subst boot_code/,,$@) boot_code/%.txt: - ${Q}make ${MAKEOPTS} -C boot_code $(subst boot_code/,,$@) + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=boot_code/ -C boot_code $(subst boot_code/,,$@) .PHONY:${SYSTEM_VVP} ${SYSTEM_VVP}: - ${Q}make ${MAKEOPTS} -C system system.vvp + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=system/ -C system system.vvp .PHONY:${VERILATOR_BIN} ${VERILATOR_BIN}: - ${Q}make ${MAKEOPTS} -C system obj_dir/Vsystem + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=system/ -C system obj_dir/Vsystem .PHONY: clean clean: - ${Q}make ${MAKEOPTS} -C system clean - ${Q}make ${MAKEOPTS} -C boot_code clean + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=system/ -C system clean + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=boot_code/ -C boot_code clean upload: boot_code/bios.stxt - ${Q}make ${MAKEOPTS} -C system upload + ${Q}make ${MAKEOPTS} PRINT_PATH_PREFIX=system/ -C system upload diff --git a/common.mk b/common.mk index 0bb6baa..b85e72f 100644 --- a/common.mk +++ b/common.mk @@ -34,23 +34,23 @@ VERSION="v0.3.0-dev" COMMIT=$(shell if which git >/dev/null 2>/dev/null ;then git log --pretty=format:'%H' -1 |cat ;else echo git-not-installed; fi) ifeq "${QUIET}" "1" - QUIET_AS = @echo ' AS '$@; + QUIET_AS = @echo ' AS '${PRINT_PATH_PREFIX}$@; - QUIET_VVP = @echo ' VVP '$@; - QUIET_IVERILOG = @echo ' IVERILOG '$@; + QUIET_VVP = @echo ' VVP '${PRINT_PATH_PREFIX}$@; + QUIET_IVERILOG = @echo ' IVERILOG '${PRINT_PATH_PREFIX}$@; - QUIET_VERILATOR = @echo ' VERILATOR '$@; - QUIET_CC = @echo ' CC '$@; + QUIET_VERILATOR = @echo ' VERILATOR '${PRINT_PATH_PREFIX}$@; + QUIET_CC = @echo ' CC '${PRINT_PATH_PREFIX}$@; - QUIET_YOSYS = @echo ' YOSYS '$@; - QUIET_NEXTPNR = @echo ' NEXTPNR '$@; - QUIET_ECPPACK = @echo ' ECPPACK '$@; - QUIET_DFU_SUFFIX = @echo ' DFU-SUFFIX '$@; - QUIET_DFU_UTIL = @echo ' DFU-UTIL '$<; + QUIET_YOSYS = @echo ' YOSYS '${PRINT_PATH_PREFIX}$@; + QUIET_NEXTPNR = @echo ' NEXTPNR '${PRINT_PATH_PREFIX}$@; + QUIET_ECPPACK = @echo ' ECPPACK '${PRINT_PATH_PREFIX}$@; + QUIET_DFU_SUFFIX = @echo ' DFU-SUFFIX '${PRINT_PATH_PREFIX}$@; + QUIET_DFU_UTIL = @echo ' DFU-UTIL '${PRINT_PATH_PREFIX}$<; - QUIET_DOWNLOAD = @echo ' DOWNLOAD '$@; + QUIET_DOWNLOAD = @echo ' DOWNLOAD '${PRINT_PATH_PREFIX}$@; - QUIET_CLEAN = @echo ' CLEAN '$1; + QUIET_CLEAN = @echo ' CLEAN '${PRINT_PATH_PREFIX}; QUIET_VERILATOR_RUN = @printf ' %s %s\n' $1 $2; Q = @ MAKEOPTS=--no-print-directory