added pbinfo and pbdemo programs

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

diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index e48782d7ed8c78bc14cdd30fb7984332f210309d..4f5a1e13ca862bfb49d2aa4b57d602497b590db4 100644 (file)
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,8 +1,8 @@
-# $Id: Makefile.X11,v 1.3 1999/10/27 10:09:53 brianp Exp $
+# $Id: Makefile.X11,v 1.13 2002/10/05 18:30:46 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  Brian Paul
+# Version:  4.1
+# Copyright (C) 1995-2002  Brian Paul
 
 # Makefile for non-GLUT (X11, SVGA, etc) demo programs
 
@@ -12,11 +12,23 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lGLU -lGL $(APP_LIB_DEPS)
 
-LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
+LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB)
 
-PROGS = glxdemo glxpixmap offset xdemo glxinfo
+PROGS = glthreads \
+       glxdemo \
+       glxgears \
+       glxheads \
+       glxinfo \
+       glxpixmap \
+       manywin \
+       offset \
+       pbinfo \
+       pbdemo \
+       wincopy \
+       xdemo \
+       xfont
 
 
 
@@ -33,7 +45,7 @@ PROGS = glxdemo glxpixmap offset xdemo glxinfo
 ##### TARGETS #####
 
 default:
-       @echo "Specify a target configuration"
+       @echo "Specify a target configuration (i.e. make -f Makefile.X11 linux)"
 
 clean:
        -rm *.o *~
@@ -56,3 +68,18 @@ exec: $(PROGS)
 
 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 $@
+
+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) $<
+