summaryrefslogtreecommitdiff
path: root/src/glut
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-06-10 14:46:24 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-06-10 14:46:24 +0000
commitb953bebc250b36c9a01dbeafe420f808aa3522d6 (patch)
tree1e9be8007bd263e4d3650ac4978f684a3bf734fa /src/glut
parent9ac51f57efe07ed43a1e4224a7f5daddec401b36 (diff)
updated old-style makefiles for new tree
Diffstat (limited to 'src/glut')
-rw-r--r--src/glut/glx/Makefile.X1116
1 files changed, 8 insertions, 8 deletions
diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11
index c448b64b6a..0427f3f5fb 100644
--- a/src/glut/glx/Makefile.X11
+++ b/src/glut/glx/Makefile.X11
@@ -1,5 +1,3 @@
-# $Id: Makefile.X11,v 1.3 2002/08/17 00:20:48 brianp Exp $
-
# Makefile for GLUT
#
# NOTICE: The OpenGL Utility Toolkit (GLUT) distribution contains source
@@ -23,8 +21,9 @@ GLUT_TINY = 1
VPATH = RCS
-INCDIR = ../include
-LIBDIR = ../lib
+TOP = ../../..
+INCDIR = $(TOP)/include
+LIBDIR = $(TOP)/lib
SOURCES = \
glut_8x13.c \
@@ -102,10 +101,11 @@ targets: $(LIBDIR)/$(GLUT_LIB)
# Make the library
$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
- $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(GLUT_TINY) $(OBJECTS)
- mv $(GLUT_LIB)* $(LIBDIR)
+ $(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
+ -patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
+ $(OBJECTS)
-include ../Make-config
+include $(TOP)/Make-config
include depend
@@ -116,4 +116,4 @@ include depend
# by any source file.
#
dep: $(SOURCES)
- makedepend -fdepend -Y -I../include $(SOURCES)
+ makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)