summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/redbook/Makefile109
-rw-r--r--src/redbook/Makefile.am93
4 files changed, 95 insertions, 109 deletions
diff --git a/configure.ac b/configure.ac
index 63ab338..1c863b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_OUTPUT([
src/demos/Makefile
src/fp/Makefile
src/glsl/Makefile
+ src/redbook/Makefile
src/samples/Makefile
src/slang/Makefile
src/tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ccd2a1..6db77d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS = \
demos \
fp \
glsl \
+ redbook \
samples \
slang \
tests \
diff --git a/src/redbook/Makefile b/src/redbook/Makefile
deleted file mode 100644
index b41e488..0000000
--- a/src/redbook/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-# progs/redbook/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-INCDIR = $(TOP)/include
-
-LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-PROGS = aaindex \
- aapoly \
- aargb \
- accanti \
- accpersp \
- alpha \
- alpha3D \
- anti \
- bezcurve \
- bezmesh \
- checker \
- clip \
- colormat \
- combiner \
- convolution \
- cube \
- cubemap \
- depthcue \
- dof \
- double \
- drawf \
- feedback \
- fog \
- fogcoord \
- fogindex \
- font \
- hello \
- histogram \
- image \
- light \
- lines \
- list \
- material \
- minmax \
- mipmap \
- model \
- movelight \
- multitex \
- multisamp \
- mvarray \
- nurbs \
- pickdepth \
- picksquare \
- plane \
- planet \
- pointp \
- polyoff \
- polys \
- quadric \
- robot \
- sccolorlight \
- scene \
- scenebamb \
- sceneflat \
- select \
- shadowmap \
- smooth \
- stencil \
- stroke \
- surface \
- surfpoints \
- teaambient \
- teapots \
- tess \
- tesswind \
- texbind \
- texgen \
- texprox \
- texsub \
- texturesurf \
- texture3d \
- torus \
- trim \
- unproject \
- varray \
- wrap
-
-
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c: $(LIB_DEP)
- $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
-
-
-
-##### TARGETS ######
-
-default: $(PROGS)
-
-
-clean:
- -rm -f $(PROGS)
- -rm -f *.o *~
-
diff --git a/src/redbook/Makefile.am b/src/redbook/Makefile.am
new file mode 100644
index 0000000..e4893e7
--- /dev/null
+++ b/src/redbook/Makefile.am
@@ -0,0 +1,93 @@
+# Copyright © 2009 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Authors:
+# Eric Anholt <eric@anholt.net>
+
+if HAVE_GLUT
+noinst_PROGRAMS = \
+ aaindex \
+ aapoly \
+ aargb \
+ accanti \
+ accpersp \
+ alpha \
+ alpha3D \
+ anti \
+ bezcurve \
+ bezmesh \
+ checker \
+ clip \
+ colormat \
+ cube \
+ depthcue \
+ dof \
+ double \
+ drawf \
+ feedback \
+ fog \
+ fogindex \
+ font \
+ hello \
+ image \
+ light \
+ lines \
+ list \
+ material \
+ mipmap \
+ model \
+ movelight \
+ nurbs \
+ pickdepth \
+ picksquare \
+ plane \
+ planet \
+ polyoff \
+ polys \
+ quadric \
+ robot \
+ sccolorlight \
+ scene \
+ scenebamb \
+ sceneflat \
+ select \
+ smooth \
+ stencil \
+ stroke \
+ surface \
+ teaambient \
+ teapots \
+ tess \
+ tesswind \
+ texbind \
+ texgen \
+ texprox \
+ texsub \
+ texturesurf \
+ torus \
+ trim \
+ unproject \
+ varray \
+ wrap
+endif
+
+EXTRA_DIST = \
+ README