Merge commit 'origin/master' into gallium-0.2

diff --cc progs/glsl/Makefile
index 0849223cd82e298cd9fe8b3a734f67109263cd47,a944abe908519c68eade4da6edd2f4a55c7b14a3..ff6359d0344680227183cddfd587cb993ae1dbea
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -188,25 -181,25 +188,33 @@@ twoside: twoside.o shaderutil.
  
  
  trirast.o: trirast.c extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
  
  trirast: trirast.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 +
 +
 +vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c
 +
 +vert-or-frag-only: vert-or-frag-only.o shaderutil.o
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@
 +
  
  
+ vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c
+ 
+ vert-or-frag-only: vert-or-frag-only.o shaderutil.o
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@
+ 
+ 
+ 
  vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
  
  vert-tex: vert-tex.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@