use APP_CC, remove redundant target

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 5cb2a044c776e291686dae571f6315eb105b5e8a..9999d6c08ab2309ece69ee0912770326c47b509a 100644 (file)
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -24,8 +24,7 @@ PROGS = \
        toyball \
        twoside \
        trirast \
-       texdemo1 \
-        convolutions
+       texdemo1 
 
 
 ##### RULES #####
@@ -68,113 +67,107 @@ shaderutil.h: $(TOP)/progs/util/shaderutil.h
        cp $< .
 
 shaderutil.o: shaderutil.c shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c
 
 
 
 bitmap.o: bitmap.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) bitmap.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) bitmap.c
 
 bitmap: bitmap.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bitmap.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bitmap.o shaderutil.o $(LIBS) -o $@
 
 
 brick.o: brick.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) brick.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) brick.c
 
 brick: brick.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) brick.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) brick.o shaderutil.o $(LIBS) -o $@
 
 
 bump.o: bump.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) bump.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) bump.c
 
 bump: bump.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bump.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bump.o shaderutil.o $(LIBS) -o $@
 
 
 convolutions.o: convolutions.c readtex.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
 
 convolutions: convolutions.o readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) convolutions.o readtex.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) convolutions.o readtex.o $(LIBS) -o $@
 
 
 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 $@
 
 
 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
-       $(CC) -c -I$(INCDIR) $(CFLAGS) noise.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) noise.c
 
 noise: noise.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@
 
 
 points.o: points.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) points.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) points.c
 
 points: points.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) points.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) points.o shaderutil.o $(LIBS) -o $@
 
 
 pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
 
 pointcoord: pointcoord.o readtex.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
 
 
 texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
 
 texdemo1: texdemo1.o readtex.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
 
 
 toyball.o: toyball.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) toyball.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) toyball.c
 
 toyball: toyball.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) toyball.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) toyball.o shaderutil.o $(LIBS) -o $@
 
 
 twoside.o: twoside.c extfuncs.h shaderutil.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) twoside.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) twoside.c
 
 twoside: twoside.o shaderutil.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) twoside.o shaderutil.o $(LIBS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) twoside.o shaderutil.o $(LIBS) -o $@
 
 
 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 $@
 
 
-convolutions: convolutions.o readtex.o
-       $(APP_CC) -I$(INCDIR) $(CFLAGS) convolutions.o readtex.o $(APP_LIB_DEPS) -o $@
-
-convolutions.o: convolutions.c readtex.h
-       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
-
 
 clean:
        -rm -f $(PROGS)