summaryrefslogtreecommitdiffstats
path: root/progs/samples
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/samples
parent8c20c7ba0c786c816d9a5c826da318beb2d2c0b7 (diff)
downloadexternal_mesa3d-3ba8a49c810d5976c705160e8c96ae682ab85250.zip
external_mesa3d-3ba8a49c810d5976c705160e8c96ae682ab85250.tar.gz
external_mesa3d-3ba8a49c810d5976c705160e8c96ae682ab85250.tar.bz2
Remove a bunch of really old/obsolete configs.
Use the new mklib script.
Diffstat (limited to 'progs/samples')
-rw-r--r--progs/samples/Makefile.X1126
1 files changed, 6 insertions, 20 deletions
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11
index dd0c5e5..b18a195 100644
--- a/progs/samples/Makefile.X11
+++ b/progs/samples/Makefile.X11
@@ -1,18 +1,13 @@
-# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
-
-# Mesa 3-D graphics library
-# Version: 3.3
-# Copyright (C) 1995-1999 Brian Paul
-
# Makefile for assorted SGI OpenGL demos
##### 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)
@@ -27,7 +22,7 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
.SUFFIXES: .c
.c: $(LIB_DEP)
- $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+ $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
@@ -45,14 +40,5 @@ realclean:
targets: $(PROGS)
-# execute all programs
-exec: $(PROGS)
- @for prog in $(PROGS) ; \
- do \
- echo -n "Running $$prog ..." ; \
- ./$$prog; \
- echo ; \
- done
-
-include ../Make-config
+include $(TOP)/Make-config