Mesa (master): demos: move glslnoise.c demo to glsl/noise2.c

[Brian Paul]

Module: Mesa
Branch: master
Commit: 118856641f4871d6f6afd1abb67ad7fe56a6814b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=118856641f4871d6f6afd1abb67ad7fe56a6814b

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Apr 18 12:54:27 2009 -0600

demos: move glslnoise.c demo to glsl/noise2.c

---

 progs/demos/Makefile                       |    1 -
 progs/glsl/Makefile                        |    8 ++++++++
 progs/{demos/glslnoise.c => glsl/noise2.c} |    0 
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 32c6072..43bf09c 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -32,7 +32,6 @@ PROGS = \
 	geartrain \
 	glinfo \
 	gloss \
-	glslnoise \
 	gltestperf \
 	glutfx \
 	isosurf \
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 5fb95c4..8e61ab6 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -23,6 +23,7 @@ PROGS = \
 	multinoise \
 	multitex \
 	noise \
+	noise2 \
 	points \
 	pointcoord \
 	samplers \
@@ -163,6 +164,13 @@ noise: noise.o shaderutil.o
 	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@
 
 
+noise2.o: noise2.c extfuncs.h shaderutil.h
+	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) noise2.c
+
+noise2: noise2.o shaderutil.o
+	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise2.o shaderutil.o $(LIBS) -o $@
+
+
 points.o: points.c extfuncs.h shaderutil.h
 	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) points.c
 
diff --git a/progs/demos/glslnoise.c b/progs/glsl/noise2.c
similarity index 100%
rename from progs/demos/glslnoise.c
rename to progs/glsl/noise2.c