Remove a bunch of really old/obsolete configs.

Use the new mklib script.

4 files changed, 44 insertions, 98 deletions

diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index f6e6aa91d9b..7c6c8500be4 100644
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,18 +1,13 @@
-# $Id: Makefile.X11,v 1.23 2003/04/21 14:04:27 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  5.1
-# Copyright (C) 1995-2003  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
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
 OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 
@@ -71,7 +66,7 @@ PROGS = \
 
 # make executable from .c file:
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
 
 # special case: need the -lOSMesa library:
 osdemo: osdemo.c
@@ -95,20 +90,10 @@ targets: readtex.c readtex.h $(PROGS)
 
 
 readtex.c:
-	cp ../util/readtex.c .
+	cp $(TOP)/util/readtex.c .
 
 readtex.h:
-	cp ../util/readtex.h .
-
-
-# execute all programs
-exec: $(PROGS)
-	@for prog in $(PROGS) ;			\
-	do					\
-		echo -n "Running $$prog ..." ;	\
-		$$prog ;			\
-		echo ;				\
-	done
+	cp $(TOP)/util/readtex.h .
 
 
-include ../Make-config
+include $(TOP)/Make-config
diff --git a/progs/redbook/Makefile.X11 b/progs/redbook/Makefile.X11
index 4446132d936..0a3a87bf545 100644
--- a/progs/redbook/Makefile.X11
+++ b/progs/redbook/Makefile.X11
@@ -1,18 +1,13 @@
-# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1998  Brian Paul
-
 # Makefile for programs from the OpenGL Programming Guide
 
 
 ##### MACROS #####
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
@@ -33,7 +28,7 @@ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
 
 
 
@@ -51,14 +46,5 @@ realclean:
 
 targets: $(PROGS)
 
-# execute all programs
-exec: $(PROGS)
-	@for prog in $(PROGS) ;			\
-	do					\
-		echo -n "Running $$prog ..." ;	\
-		$$prog ;			\
-		echo ;				\
-	done
-
 
-include ../Make-config
+include $(TOP)/Make-config
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11
index dd0c5e53eb3..b18a19584ab 100644
--- a/progs/samples/Makefile.X11
+++ b/progs/samples/Makefile.X11
@@ -1,18 +1,13 @@
-# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.3
-# Copyright (C) 1995-1999  Brian Paul
-
 # Makefile for assorted SGI OpenGL demos
 
 
 ##### MACROS #####
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
@@ -27,7 +22,7 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
 
 
 
@@ -45,14 +40,5 @@ realclean:
 
 targets: $(PROGS)
 
-# execute all programs
-exec: $(PROGS)
-	@for prog in $(PROGS) ;			\
-	do					\
-		echo -n "Running $$prog ..." ;	\
-		./$$prog;			\
-		echo ;				\
-	done
-
 
-include ../Make-config
+include $(TOP)/Make-config
diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index 4f5a1e13ca8..27b4342309c 100644
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,18 +1,13 @@
-# $Id: Makefile.X11,v 1.13 2002/10/05 18:30:46 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  4.1
-# Copyright (C) 1995-2002  Brian Paul
-
 # Makefile for non-GLUT (X11, SVGA, etc) demo programs
 
 
 ##### MACROS #####
 
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
 
-GL_LIBS = -L$(LIBDIR) -lGLU -lGL $(APP_LIB_DEPS)
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB)
 
@@ -38,7 +33,24 @@ PROGS = glthreads \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+
+
+# special cases
+pbinfo: pbinfo.o pbutil.o
+	$(CC) pbinfo.o pbutil.o $(LIBS) -o $@
+
+pbdemo: pbdemo.o pbutil.o
+	$(CC) pbdemo.o pbutil.o $(LIBS) -o $@
+
+pbinfo.o: pbinfo.c pbutil.h
+	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
+
+pbdemo.o: pbdemo.c pbutil.h
+	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
+
+pbutil.o: pbutil.c pbutil.h
+	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
 
 
 
@@ -56,30 +68,7 @@ realclean:
 
 targets: $(PROGS)
 
-# execute all programs
-exec: $(PROGS)
-	@for prog in $(PROGS) ;			\
-	do					\
-		echo -n "Running $$prog ..." ;	\
-		$$prog ;			\
-		echo ;				\
-	done
-
-
-include ../Make-config
 
-pbinfo: pbinfo.o pbutil.o
-	$(CC) pbinfo.o pbutil.o $(GL_LIBS) -o $@
-
-pbdemo: pbdemo.o pbutil.o
-	$(CC) pbdemo.o pbutil.o $(GL_LIBS) -o $@
+include $(TOP)/Make-config
 
-pbinfo.o: pbinfo.c pbutil.h
-	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<
-
-pbdemo.o: pbdemo.c pbutil.h
-	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<
-
-pbutil.o: pbutil.c pbutil.h
-	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<