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/egl | |
| 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/egl')
| -rw-r--r-- | src/egl/Makefile | 6 | ||||
| -rw-r--r-- | src/egl/drivers/demo/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/drivers/dri/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/main/Makefile | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/egl/Makefile b/src/egl/Makefile index 931e9d0cb86..fb4db8f9b9f 100644 --- a/src/egl/Makefile +++ b/src/egl/Makefile @@ -11,14 +11,14 @@ default: subdirs subdirs: @for dir in $(SUBDIRS) ; do \ if [ -d $$dir ] ; then \ - (cd $$dir ; $(MAKE)) || exit 1 ; \ + (cd $$dir && $(MAKE)) || exit 1 ; \ fi \ done clean: - @for dir in $(SUBDIRS) ; do \ + -@for dir in $(SUBDIRS) ; do \ if [ -d $$dir ] ; then \ - (cd $$dir ; $(MAKE) clean) ; \ + (cd $$dir && $(MAKE) clean) ; \ fi \ done diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile index ad2ef38a72f..9653c8805cc 100644 --- a/src/egl/drivers/demo/Makefile +++ b/src/egl/drivers/demo/Makefile @@ -27,5 +27,5 @@ $(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS) clean: - rm -f *.o - rm -f *.so + -rm -f *.o + -rm -f *.so diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile index 0214cf65a25..52d46cac564 100644 --- a/src/egl/drivers/dri/Makefile +++ b/src/egl/drivers/dri/Makefile @@ -47,8 +47,8 @@ $(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS) clean: - rm -f *.o - rm -f *.so + -rm -f *.o + -rm -f *.so depend: $(SOURCES) $(HEADERS) @ echo "running $(MKDEP)" diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 2a7046fb145..52e16a76e3a 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -52,8 +52,8 @@ $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS) clean: - rm -f *.o *.so* - rm -f core.* + -rm -f *.o *.so* + -rm -f core.* depend: $(SOURCES) $(HEADERS) |