changeset 2944:ab3f9eb5fc5c

level*/makefile: Abort if dsk or dskcopy target fails in subdir
author Tormod Volden <debian.tormod@gmail.com>
date Mon, 27 Jan 2014 23:49:14 +0100
parents bf97abc5bddf
children 582b5b7232c0
files level1/makefile level2/makefile
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Mon Jan 27 23:48:58 2014 +0100
+++ b/level1/makefile	Mon Jan 27 23:49:14 2014 +0100
@@ -20,11 +20,11 @@
 
 # Make DSK images
 dsk:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dsk);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) :
 
 # Copy DSK images
 dskcopy:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) :
 
 # Clean DSK images
 dskclean:
--- a/level2/makefile	Mon Jan 27 23:48:58 2014 +0100
+++ b/level2/makefile	Mon Jan 27 23:49:14 2014 +0100
@@ -20,11 +20,11 @@
 
 # Make DSK images
 dsk:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dsk);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) :
 
 # Copy DSK images
 dskcopy:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) :
 
 # Clean DSK images
 dskclean: