s/DP4/DP3/

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

diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index eed5dc458e944b3fefc07f61ab4482dcf8baa753..36fa9e57d07b2094d15ac4ec8f8e3c56a7896a0d 100644 (file)
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,22 +1,29 @@
-# $Id: Makefile.X11,v 1.4 1999/11/05 08:01:17 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  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) -lglut -lGLU -lGL $(XLIBS)
+LIBS = -L$(LIBDIR) $(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 xfont
+PROGS = glthreads \
+       glxdemo \
+       glxgears \
+       glxheads \
+       glxinfo \
+       glxpixmap \
+       manywin \
+       offset \
+       pbinfo \
+       pbdemo \
+       wincopy \
+       xdemo \
+       xfont
 
 
 
@@ -26,14 +33,31 @@ PROGS = glxdemo glxpixmap offset xdemo glxinfo xfont
 .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
 
 
 
 ##### TARGETS #####
 
 default:
-       @echo "Specify a target configuration"
+       @echo "Specify a target configuration (i.e. make -f Makefile.X11 linux)"
 
 clean:
        -rm *.o *~
@@ -44,15 +68,7 @@ realclean:
 
 targets: $(PROGS)
 
-# execute all programs
-exec: $(PROGS)
-       @for prog in $(PROGS) ;                 \
-       do                                      \
-               echo -n "Running $$prog ..." ;  \
-               $$prog ;                        \
-               echo ;                          \
-       done
 
+include $(TOP)/Make-config
 
-include ../Make-config