summaryrefslogtreecommitdiff
path: root/progs/demos
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-06-01 16:25:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-06-01 16:25:02 +0000
commit3ba8a49c810d5976c705160e8c96ae682ab85250 (patch)
treebbd9a43eef9f973284e88a7fb9c0c8fa2c8cc9e7 /progs/demos
parent8c20c7ba0c786c816d9a5c826da318beb2d2c0b7 (diff)
Remove a bunch of really old/obsolete configs.
Use the new mklib script.
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/Makefile.X1133
1 files changed, 9 insertions, 24 deletions
diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index f6e6aa91d9..7c6c8500be 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