From 946b49ebcbf47e030a6e00ce1a699f3b055f638a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 17 Mar 2010 17:37:05 -0500 Subject: [PATCH] Catch errors in recursive relink targets If make relink fails in a subdirectory, we need to catch the error otherwise make will continue iterating the 'for' loop. Signed-off-by: Yaakov Selkowitz Reviewed-by: Dan Nicholson --- hw/Makefile.am | 2 +- hw/kdrive/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/Makefile.am b/hw/Makefile.am index 92b007aca..6c2cc6bd4 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -38,4 +38,4 @@ SUBDIRS = \ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive relink: - $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done + $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index 55d940f40..471ca89dd 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -27,4 +27,4 @@ SUBDIRS = \ DIST_SUBDIRS = fbdev ephyr src linux fake relink: - $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink ; done + $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done