From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 24 Nov 2008 21:08:58 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df6155fcff66034457b3165f5df0a61ccfc41314;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/glsl/Makefile
---

df6155fcff66034457b3165f5df0a61ccfc41314
diff --cc progs/glsl/Makefile
index 9f5a2b7df5b,7c3e750882f..5419dfc7f46
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -103,37 -101,31 +103,44 @@@ convolutions: convolutions.o readtex.
  
  
  deriv.o: deriv.c extfuncs.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) deriv.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) deriv.c
  
  deriv: deriv.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@
 +
 +
 +identity.o: identity.c extfuncs.h shaderutil.h
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) identity.c
 +
 +identity: identity.o shaderutil.o
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) identity.o shaderutil.o $(LIBS) -o $@
 +
 +
 +fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
 +	$(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c
 +
 +fragcoord: fragcoord.o shaderutil.o
 +	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@
  
  
+ fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c
+ 
+ fragcoord: fragcoord.o shaderutil.o
+ 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@
+ 
+ 
  mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
  
  mandelbrot: mandelbrot.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@
 -
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@
  
  multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
  
  multitex: multitex.o readtex.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@
  
  
  noise.o: noise.c extfuncs.h shaderutil.h