4 files changed, 9 insertions, 13 deletions
diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 3a195633585..3fe75a36ff4 100644
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,10 +1,9 @@
-# $Id: Makefile.X11,v 1.4 2000/01/28 16:27:27 brianp Exp $
+# $Id: Makefile.X11,v 1.5 2000/02/16 01:09:06 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
 
 
@@ -13,7 +12,7 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
diff --git a/progs/redbook/Makefile.X11 b/progs/redbook/Makefile.X11
index d08d794b388..4446132d936 100644
--- a/progs/redbook/Makefile.X11
+++ b/progs/redbook/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.2 1999/10/27 10:09:53 brianp Exp $
+# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.1
@@ -12,7 +12,7 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11
index 72acbcbb588..dd0c5e53eb3 100644
--- a/progs/samples/Makefile.X11
+++ b/progs/samples/Makefile.X11
@@ -1,20 +1,18 @@
-# $Id: Makefile.X11,v 1.2 1999/10/27 10:09:53 brianp Exp $
+# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.1
+# Version:  3.3
 # Copyright (C) 1995-1999  Brian Paul
 
-
 # Makefile for assorted SGI OpenGL demos
 
 
-
 ##### MACROS #####
 
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
@@ -23,7 +21,6 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
 	shape sphere star stencil stretch texture tri wave
 
 
-
 ##### RULES #####
 
 .SUFFIXES:
diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index 19dba9bb9d6..115991c4b57 100644
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.6 1999/11/25 17:42:01 brianp Exp $
+# $Id: Makefile.X11,v 1.7 2000/02/16 01:09:06 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.3
@@ -12,7 +12,7 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)