diff options
Diffstat (limited to 'progs/samples')
| -rw-r--r-- | progs/samples/Makefile.X11 | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11 index dd0c5e53eb3..b18a19584ab 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 |