Merge commit 'origin/master' into gallium-0.2

[android-x86/external-mesa.git] / progs / glsl / Makefile

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 5419dfc..ce82468 100644 (file)
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -27,7 +27,7 @@ PROGS = \
        toyball \
        twoside \
        trirast \
-       texdemo1 
+       vert-tex
 
 
 ##### RULES #####
@@ -123,13 +123,6 @@ 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
        $(APP_CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
 
@@ -196,7 +189,19 @@ trirast.o: trirast.c extfuncs.h shaderutil.h
        $(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 
 trirast: trirast.o shaderutil.o
+<<<<<<< HEAD:progs/glsl/Makefile
        $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
+=======
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
+
+
+vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
+       $(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 $@
+
+>>>>>>> origin/master:progs/glsl/Makefile