diff options
| author | Dan Nicholson <[email protected]> | 2008-05-07 07:11:49 -0700 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2008-05-07 07:11:49 -0700 |
| commit | ec813878e4889be97535cf01bd2b49fd09467a47 (patch) | |
| tree | 7586719bd91c73899426536d41cba01818fd67dd | |
| parent | df43fb661b2030d9b833a42dd47b8d7bf58d73aa (diff) | |
Ensure recursive makes always propagate errors
There were a couple spots left where a recursive make could fail in a
chain of commands without stopping.
| -rw-r--r-- | src/glu/mesa/Makefile | 2 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile index fb377555bea..1064bbd2d4f 100644 --- a/src/glu/mesa/Makefile +++ b/src/glu/mesa/Makefile @@ -37,7 +37,7 @@ default: echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ exit 0 ; \ else \ - $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ + $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \ fi $(TOP)/$(LIB_DIR): diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile index bb1c0a8aba5..207247ad87a 100644 --- a/src/glu/sgi/Makefile +++ b/src/glu/sgi/Makefile @@ -128,7 +128,7 @@ default: echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \ exit 0 ; \ else \ - $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) ; \ + $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \ fi $(TOP)/$(LIB_DIR): diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 70d31ad6c18..75683908625 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -27,12 +27,12 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) default: depend @for driver in $(DRIVER_DIRS) ; do \ case "$$driver" in \ - x11) $(MAKE) stand-alone ;; \ - dri) $(MAKE) linux-solo ;; \ - osmesa) $(MAKE) osmesa-only ;; \ - beos) $(MAKE) beos ;; \ - directfb) $(MAKE) directfb ;; \ - fbdev) $(MAKE) fbdev ;; \ + x11) $(MAKE) stand-alone || exit 1 ;; \ + dri) $(MAKE) linux-solo || exit 1 ;; \ + osmesa) $(MAKE) osmesa-only || exit 1 ;; \ + beos) $(MAKE) beos || exit 1 ;; \ + directfb) $(MAKE) directfb || exit 1 ;; \ + fbdev) $(MAKE) fbdev || exit 1 ;; \ *) echo "$$driver is invalid in DRIVER_DIRS" >&2; exit 1;; \ esac ; \ done |