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.

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index fb377555bea224c109e9254c74dd274e1fd4250e..1064bbd2d4f7172a632f84fc0a40860d5ced8a8b 100644 (file)
--- 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 bb1c0a8aba51711fe0a7d2252328fdf03fdb2184..207247ad87af7435536012bb1488efc5b1440a4b 100644 (file)
--- 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 70d31ad6c18eae19271fdafb3d20b873af1ed8a9..75683908625b95add363e9cc5c2ed6a9dc80f3eb 100644 (file)
--- 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