Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	progs/fp/Makefile

diff --cc progs/fp/Makefile
index 2089fc5,65b2cc1..ab43cde
--- 1/progs/fp/Makefile
--- 2/progs/fp/Makefile
+++ b/progs/fp/Makefile
@@@ -40,13 -40,13 +40,13 @@@ UTIL_FILES = readtex.h readtex.
  .SUFFIXES: .c
  
  .c:
-       $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
++      $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  .c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  .S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
  
  
  ##### TARGETS #####
@@@ -67,19 -67,19 +67,27 @@@ getproclist.h: $(TOP)/src/mesa/glapi/gl
  
  
  texrect: texrect.o readtex.o
++<<<<<<< HEAD:progs/fp/Makefile
 +      $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
++=======
+       $(APP_CC) texrect.o readtex.o $(LIBS) -o $@
++>>>>>>> origin/gallium-0.1:progs/fp/Makefile
  
  texrect.o: texrect.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  invert: invert.o readtex.o
++<<<<<<< HEAD:progs/fp/Makefile
 +      $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
++=======
+       $(APP_CC) invert.o readtex.o $(LIBS) -o $@
++>>>>>>> origin/gallium-0.1:progs/fp/Makefile
  
  invert.o: invert.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  readtex.o: readtex.c
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  
  readtex.h: $(TOP)/progs/util/readtex.h

diff --cc src/egl/drivers/dri/Makefile
Simple merge