diff --git a/Makefile b/Makefile
index 584b100f..6bf9e4a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 .PHONY: tools source clean clobber diff dist
 
+.ONESHELL:
+.SHELLFLAGS = -cex
+
 all: tools source
 
 tools:
@@ -21,8 +24,8 @@ diff:
 
 dist:
 	$(MAKE) ROM_PLATFORM=dist
-	$(MAKE) --directory Source clean
 	$(MAKE) --directory Tools clean
+	$(MAKE) --directory Source clean
 
 distlog:
 	$(MAKE) dist 2>&1 | tee make.log
diff --git a/Source/Makefile b/Source/Makefile
index 606ce15f..275b5162 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -4,6 +4,9 @@
 
 .PHONY: doc prop shared bp images rom zrc zzrcc
 
+.ONESHELL:
+.SHELLFLAGS = -cex
+
 all: prop shared images rom zrc zzrcc
 
 doc:
@@ -45,9 +48,7 @@ zzrcc:
 	$(MAKE) --directory ZZRCC $(ACTION)
 
 clean: ACTION=clean
-
 clean: all
 
 diff: ACTION=diff
-
 diff: all
diff --git a/Tools/Makefile b/Tools/Makefile
index b6093e4c..74baac9a 100644
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -1,6 +1,10 @@
 #
 # build the tools for linux and Darwin
 #
+
+.ONESHELL:
+.SHELLFLAGS = -cex
+
 UNAME := $(shell uname)
 
 all:
diff --git a/Tools/unix/Makefile b/Tools/unix/Makefile
index c015806f..ebdecfb5 100644
--- a/Tools/unix/Makefile
+++ b/Tools/unix/Makefile
@@ -1,6 +1,10 @@
 #
 # build the tools for linux and Darwin
 #
+
+.ONESHELL:
+.SHELLFLAGS = -cex
+
 UNAME := $(shell uname)
 ifeq ($(UNAME), Linux)
 	SUFFIX=linux