From b1461f5a52c340c4672f0fed025c235088aed92b Mon Sep 17 00:00:00 2001 From: chaoskagami Date: Fri, 1 Jul 2016 10:32:29 -0400 Subject: [PATCH] Makefile cleanup --- Makefile | 2 +- contrib/Makefile | 4 ++-- external/Makefile | 4 ++-- patch/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f57e947..8ac97ad 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ AS ?= as LD ?= ld OC ?= objcopy -name := Corbenik +name ?= Corbenik # If unset, the primary folder is /corbenik. fw_folder ?= corbenik diff --git a/contrib/Makefile b/contrib/Makefile index c2f7f86..c2489ab 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -6,8 +6,8 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco)) .PHONY: install install: build - mkdir -p ../out/corbenik/contrib - cp *.vco README.md ../out/corbenik/contrib/ + mkdir -p $(out)/contrib + cp *.vco README.md $(out)/contrib/ %.vco: %.pco ../host/bytecode_asm.py $< $@ diff --git a/external/Makefile b/external/Makefile index dd7035d..e421fe3 100644 --- a/external/Makefile +++ b/external/Makefile @@ -16,8 +16,8 @@ endif .PHONY: clean clean: clean_loader clean_bits clean_screeninit - rm -rf ../out/corbenik/bits - rm -rf ../out/corbenik/module + rm -rf $(out)/bits + rm -rf $(out)/module .PHONY: loader loader: diff --git a/patch/Makefile b/patch/Makefile index 73c8f53..7873eaa 100644 --- a/patch/Makefile +++ b/patch/Makefile @@ -6,8 +6,8 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco)) .PHONY: install install: build - mkdir -p ../out/corbenik/patch - cp *.vco ../out/corbenik/patch/ + mkdir -p $(out)/patch + cp *.vco $(out)/patch/ %.vco: %.pco ../host/bytecode_asm.py $< $@ -- 2.39.5