Browse Source

Makefile Improvements

These changes improve the chances of a make operation actually failing when a nested error occurs.
patch
Wayne Warthen 2 years ago
parent
commit
ef536750ea
  1. 5
      Makefile
  2. 5
      Source/Makefile
  3. 4
      Tools/Makefile
  4. 4
      Tools/unix/Makefile

5
Makefile

@ -1,5 +1,8 @@
.PHONY: tools source clean clobber diff dist .PHONY: tools source clean clobber diff dist
.ONESHELL:
.SHELLFLAGS = -cex
all: tools source all: tools source
tools: tools:
@ -21,8 +24,8 @@ diff:
dist: dist:
$(MAKE) ROM_PLATFORM=dist $(MAKE) ROM_PLATFORM=dist
$(MAKE) --directory Source clean
$(MAKE) --directory Tools clean $(MAKE) --directory Tools clean
$(MAKE) --directory Source clean
distlog: distlog:
$(MAKE) dist 2>&1 | tee make.log $(MAKE) dist 2>&1 | tee make.log

5
Source/Makefile

@ -4,6 +4,9 @@
.PHONY: doc prop shared bp images rom zrc zzrcc .PHONY: doc prop shared bp images rom zrc zzrcc
.ONESHELL:
.SHELLFLAGS = -cex
all: prop shared images rom zrc zzrcc all: prop shared images rom zrc zzrcc
doc: doc:
@ -45,9 +48,7 @@ zzrcc:
$(MAKE) --directory ZZRCC $(ACTION) $(MAKE) --directory ZZRCC $(ACTION)
clean: ACTION=clean clean: ACTION=clean
clean: all clean: all
diff: ACTION=diff diff: ACTION=diff
diff: all diff: all

4
Tools/Makefile

@ -1,6 +1,10 @@
# #
# build the tools for linux and Darwin # build the tools for linux and Darwin
# #
.ONESHELL:
.SHELLFLAGS = -cex
UNAME := $(shell uname) UNAME := $(shell uname)
all: all:

4
Tools/unix/Makefile

@ -1,6 +1,10 @@
# #
# build the tools for linux and Darwin # build the tools for linux and Darwin
# #
.ONESHELL:
.SHELLFLAGS = -cex
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
SUFFIX=linux SUFFIX=linux

Loading…
Cancel
Save