diff options
| author | Keith Packard <[email protected]> | 2008-06-03 22:56:25 -0700 |
|---|---|---|
| committer | Keith Packard <[email protected]> | 2008-06-03 22:56:25 -0700 |
| commit | dbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (patch) | |
| tree | dd986e993f20f78999fc15c304289656878ffcae /src/glu | |
| parent | 4b5b008d54e86ac4f0a2176429d062100978ca8c (diff) | |
| parent | 0b734bd7cf921592eee441f759687e10f48a2cbc (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
src/mesa/drivers/dri/intel/intel_ioctl.c
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/Makefile | 6 | ||||
| -rw-r--r-- | src/glu/mesa/Makefile | 2 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/glu/Makefile b/src/glu/Makefile index 836baa684cb..23161b50156 100644 --- a/src/glu/Makefile +++ b/src/glu/Makefile @@ -10,7 +10,7 @@ SUBDIRS = $(GLU_DIRS) default: $(TOP)/configs/current @for dir in $(SUBDIRS) ; do \ - (cd $$dir ; $(MAKE)) ; \ + (cd $$dir && $(MAKE)) || exit 1 ; \ done # GLU pkg-config file @@ -28,6 +28,6 @@ install: glu.pc $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig clean: - @for dir in $(SUBDIRS) ; do \ - (cd $$dir ; $(MAKE) clean) ; \ + -@for dir in $(SUBDIRS) ; do \ + (cd $$dir && $(MAKE) clean) ; \ done 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): |