X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=progs%2Fxdemos%2FMakefile.X11;h=36fa9e57d07b2094d15ac4ec8f8e3c56a7896a0d;hb=254e20172167a090575a4854c15806db313a0e0e;hp=115991c4b5753427068aa3c39aadc36cf750a9fc;hpb=27be87cdff9ecb4a4bdb938f31b7edf28d7cb570;p=mesa.git

diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index 115991c4b57..36fa9e57d07 100644
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,22 +1,29 @@
-# $Id: Makefile.X11,v 1.7 2000/02/16 01:09:06 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version:  3.3
-# 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 $(APP_LIB_DEPS)
+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 glxdpyinfo wincopy
+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 glxdpyinfo wincopy
 .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