summaryrefslogtreecommitdiffstats
path: root/progs/trivial/Makefile
diff options
context:
space:
mode:
authorKeith Packard <[email protected]>2008-06-03 22:56:25 -0700
committerKeith Packard <[email protected]>2008-06-03 22:56:25 -0700
commitdbf3c5247c90bd35c0b2002e3b972a2dd4c8b130 (patch)
treedd986e993f20f78999fc15c304289656878ffcae /progs/trivial/Makefile
parent4b5b008d54e86ac4f0a2176429d062100978ca8c (diff)
parent0b734bd7cf921592eee441f759687e10f48a2cbc (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 'progs/trivial/Makefile')
-rw-r--r--progs/trivial/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index 7610a5df08c..6fa51ce2cfe 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -102,9 +102,9 @@ UTIL_FILES = readtex.h readtex.c
default: $(UTIL_FILES) $(PROGS)
clean:
- rm -f $(PROGS)
- rm -f *.o
- rm -f getproclist.h
+ -rm -f $(PROGS)
+ -rm -f *.o
+ -rm -f getproclist.h
# auto code generation