Remove a bunch of really old/obsolete configs.

[mesa.git] / progs / demos / Makefile.X11

diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index c96d64bafd65a50c29be4d7f3d7e96c55b23b77f..7c6c8500be4c971cbc2f5fc5b6e817a3e87d0baf 100644 (file)
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,25 +1,61 @@
-# $Id: Makefile.X11,v 1.9 2000/04/01 05:57:41 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.3
-# Copyright (C) 1995-2000  Brian Paul
-
-# Makefile for GLUT-based demo programs for Unix/X11
+# Makefile for GLUT-based demo programs
 
 
 ##### MACROS #####
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
+
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
-PROGS = bounce clearspd drawpix gamma gears geartrain glinfo gloss \
-       glutfx isosurf lodbias morph3d multiarb occlude osdemo paltex \
-       pointblast readpix reflect renormal spectex stex3d tessdemo texcyl \
-       texdown texobj trispd winpos \
+PROGS = \
+       arbfplight \
+       bounce \
+       clearspd \
+       cubemap \
+       drawpix \
+       fire \
+       fplight \
+       gamma \
+       gears \
+       geartrain \
+       glinfo \
+       gloss \
+       gltestperf \
+       glutfx \
+       isosurf \
+       ipers \
+       lodbias \
+       morph3d \
+       multiarb \
+       occlude \
+       osdemo \
+       paltex \
+       pixeltex \
+       pointblast \
+       ray \
+       readpix \
+       reflect \
+       renormal \
+       shadowtex \
+       spectex \
+       stex3d \
+       teapot \
+       terrain \
+       tessdemo \
+       texcyl \
+       texdown \
+       texenv \
+       texobj \
+       trispd \
+       tunnel \
+       tunnel2 \
+       winpos
 
 
 ##### RULES #####
@@ -27,9 +63,14 @@ PROGS = bounce clearspd drawpix gamma gears geartrain glinfo gloss \
 .SUFFIXES:
 .SUFFIXES: .c
 
+
+# make executable from .c file:
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
 
+# special case: need the -lOSMesa library:
+osdemo: osdemo.c
+       $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
 
 
 ##### TARGETS #####
@@ -43,18 +84,16 @@ clean:
 realclean:
        -rm $(PROGS)
        -rm *.o *~
+       -rm readtex.[ch]
+
+targets: readtex.c readtex.h $(PROGS)
 
-targets: $(PROGS)
 
-# execute all programs
-exec: $(PROGS)
-       @for prog in $(PROGS) ;                 \
-       do                                      \
-               echo -n "Running $$prog ..." ;  \
-               $$prog ;                        \
-               echo ;                          \
-       done
+readtex.c:
+       cp $(TOP)/util/readtex.c .
 
+readtex.h:
+       cp $(TOP)/util/readtex.h .
 
-include ../Make-config
 
+include $(TOP)/Make-config