summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/glu/mesa/Makefile.X112
-rw-r--r--src/glu/sgi/Makefile.X112
-rw-r--r--src/glut/glx/Makefile.X1116
-rw-r--r--src/glw/Makefile.X1115
-rw-r--r--src/glw/depend7
-rw-r--r--src/mesa/Makefile.X11208
6 files changed, 132 insertions, 118 deletions
diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index 3ba15704829..b50db58c36f 100644
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -10,7 +10,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS
-TOP = ..
+TOP = ../../..
INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib
diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 9c79d0d6fcb..76befaa0fa4 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -12,7 +12,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS
-TOP = ..
+TOP = ../../..
INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
LIBDIR = $(TOP)/lib
diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11
index c448b64b6ae..0427f3f5fbb 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)
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index a494e357f91..90b7f9d35ff 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -7,10 +7,12 @@ MAJOR = 1
MINOR = 0
TINY = 0
+TOP = ../..
+
VPATH = RCS
-INCDIRS = -I../include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
-LIBDIR = ../lib
+INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
+LIBDIR = $(TOP)/lib
# Use these sources for Motif (and Xt) support. Requires Motif header files.
#SOURCES = GLwDrawA.c GLwMDrawA.c
@@ -43,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
# Make the library
$(LIBDIR)/$(GLW_LIB): $(OBJECTS)
- $(MAKELIB) $(GLW_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS)
- mv $(GLW_LIB)* $(LIBDIR)
- -mv *.a $(LIBDIR)
+ $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
+ -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) $(OBJECTS)
message:
@@ -56,7 +57,7 @@ message:
@echo
-include ../Make-config
+include $(TOP)/Make-config
include depend
@@ -67,4 +68,4 @@ include depend
# by any source file.
#
dep: $(SOURCES)
- makedepend -fdepend -Y -I../include $(SOURCES)
+ makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
diff --git a/src/glw/depend b/src/glw/depend
index e0c23de53d4..00bd8391048 100644
--- a/src/glw/depend
+++ b/src/glw/depend
@@ -1,6 +1,5 @@
# DO NOT DELETE
-GLwDrawA.o: ../include/GL/glx.h ../include/GL/gl.h ../include/GL/xmesa.h
-GLwDrawA.o: GLwDrawAP.h GLwDrawA.h
-GLwMDrawA.o: GLwDrawA.c ../include/GL/glx.h ../include/GL/gl.h
-GLwMDrawA.o: ../include/GL/xmesa.h GLwDrawAP.h GLwDrawA.h GLwMDrawAP.h
+GLwDrawA.o: ../../include/GL/glx.h ../../include/GL/gl.h
+GLwDrawA.o: ../../include/GL/glext.h ../../include/GL/glxext.h GLwDrawAP.h
+GLwDrawA.o: GLwDrawA.h
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 6300b601a15..fbc5713d03e 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,5 +1,3 @@
-# $Id: Makefile.X11,v 1.79 2003/04/17 02:33:11 brianp Exp $
-
# Mesa 3-D graphics library
# Version: 5.1
# Copyright (C) 1995-2003 Brian Paul
@@ -9,77 +7,81 @@
##### MACROS #####
+TOP = ../..
+
GL_MAJOR = 1
GL_MINOR = 4
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+GL_LIB_NAME = "GL" # may be overridden in Make-config
+OSMESA_LIB_NAME = "OSMesa" # may be overridden in Make-config
+
VPATH = RCS
-INCDIR = ../include
-LIBDIR = ../lib
+LIBDIR = $(TOP)/lib
CORE_SOURCES = \
- api_arrayelt.c \
- api_loopback.c \
- api_noop.c \
- api_validate.c \
- accum.c \
- arbprogram.c \
- attrib.c \
- blend.c \
- bufferobj.c \
- buffers.c \
- clip.c \
- colortab.c \
- context.c \
- convolve.c \
- debug.c \
- depth.c \
- dispatch.c \
- dlist.c \
- drawpix.c \
- enable.c \
- enums.c \
- eval.c \
- extensions.c \
- feedback.c \
- fog.c \
- get.c \
- glapi.c \
- glthread.c \
- hash.c \
- hint.c \
- histogram.c \
- image.c \
- imports.c \
- light.c \
- lines.c \
- matrix.c \
- nvprogram.c \
- nvfragparse.c \
- nvvertexec.c \
- nvvertparse.c \
- pixel.c \
- points.c \
- polygon.c \
- rastpos.c \
- state.c \
- stencil.c \
- texcompress.c \
- texformat.c \
- teximage.c \
- texobj.c \
- texstate.c \
- texstore.c \
- texutil.c \
- varray.c \
- vtxfmt.c \
- X86/x86.c \
- X86/common_x86.c \
- X86/3dnow.c \
- X86/sse.c \
+ glapi/glapi.c \
+ glapi/glthread.c \
+ main/api_arrayelt.c \
+ main/api_loopback.c \
+ main/api_noop.c \
+ main/api_validate.c \
+ main/accum.c \
+ main/arbprogram.c \
+ main/attrib.c \
+ main/blend.c \
+ main/bufferobj.c \
+ main/buffers.c \
+ main/clip.c \
+ main/colortab.c \
+ main/context.c \
+ main/convolve.c \
+ main/debug.c \
+ main/depth.c \
+ main/dispatch.c \
+ main/dlist.c \
+ main/drawpix.c \
+ main/enable.c \
+ main/enums.c \
+ main/eval.c \
+ main/extensions.c \
+ main/feedback.c \
+ main/fog.c \
+ main/get.c \
+ main/hash.c \
+ main/hint.c \
+ main/histogram.c \
+ main/image.c \
+ main/imports.c \
+ main/light.c \
+ main/lines.c \
+ main/matrix.c \
+ main/nvprogram.c \
+ main/nvfragparse.c \
+ main/nvvertexec.c \
+ main/nvvertparse.c \
+ main/pixel.c \
+ main/points.c \
+ main/polygon.c \
+ main/rastpos.c \
+ main/state.c \
+ main/stencil.c \
+ main/texcompress.c \
+ main/texformat.c \
+ main/teximage.c \
+ main/texobj.c \
+ main/texstate.c \
+ main/texstore.c \
+ main/texutil.c \
+ main/varray.c \
+ main/vtxfmt.c \
+ x86/x86.c \
+ x86/common_x86.c \
+ x86/3dnow.c \
+ x86/sse.c \
math/m_debug_clip.c \
math/m_debug_norm.c \
math/m_debug_xform.c \
@@ -146,29 +148,29 @@ CORE_SOURCES = \
DRIVER_SOURCES = \
- FX/fxapi.c \
- FX/fxdd.c \
- FX/fxddspan.c \
- FX/fxddtex.c \
- FX/fxsetup.c \
- FX/fxtexman.c \
- FX/fxtris.c \
- FX/fxvb.c \
- FX/fxglidew.c \
- X/glxapi.c \
- X/fakeglx.c \
- X/xfonts.c \
- X/xm_api.c \
- X/xm_dd.c \
- X/xm_line.c \
- X/xm_span.c \
- X/xm_tri.c \
- SVGA/svgamesa.c \
- SVGA/svgamesa8.c \
- SVGA/svgamesa15.c \
- SVGA/svgamesa16.c \
- SVGA/svgamesa24.c \
- SVGA/svgamesa32.c
+ drivers/glide/fxapi.c \
+ drivers/glide/fxdd.c \
+ drivers/glide/fxddspan.c \
+ drivers/glide/fxddtex.c \
+ drivers/glide/fxsetup.c \
+ drivers/glide/fxtexman.c \
+ drivers/glide/fxtris.c \
+ drivers/glide/fxvb.c \
+ drivers/glide/fxglidew.c \
+ drivers/x11/glxapi.c \
+ drivers/x11/fakeglx.c \
+ drivers/x11/xfonts.c \
+ drivers/x11/xm_api.c \
+ drivers/x11/xm_dd.c \
+ drivers/x11/xm_line.c \
+ drivers/x11/xm_span.c \
+ drivers/x11/xm_tri.c \
+ drivers/svga/svgamesa.c \
+ drivers/svga/svgamesa8.c \
+ drivers/svga/svgamesa15.c \
+ drivers/svga/svgamesa16.c \
+ drivers/svga/svgamesa24.c \
+ drivers/svga/svgamesa32.c
ASM_SOURCES =
@@ -182,18 +184,28 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \
CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
-OSMESA_SOURCES = OSmesa/osmesa.c
-OSMESA_OBJECTS = OSmesa/osmesa.o
+OSMESA_SOURCES = drivers/osmesa/osmesa.c
+OSMESA_OBJECTS = drivers/osmesa/osmesa.o
+
+INCLUDE_DIRS = \
+ -I$(TOP)/include \
+ -I$(TOP)/src/mesa \
+ -I$(TOP)/src/mesa/main \
+ -I$(TOP)/src/mesa/glapi \
+ -I$(TOP)/src/mesa/math \
+ -I$(TOP)/src/mesa/transform \
+ -I$(TOP)/src/mesa/swrast \
+ -I$(TOP)/src/mesa/swrast_setup
##### RULES #####
.c.o:
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
.S.o:
- $(CC) -c -I. $(CFLAGS) $< -o $@
+ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
X86/x86.o: X86/x86.c
@@ -228,16 +240,17 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
# Make the GL library
$(LIBDIR)/$(GL_LIB): $(OBJECTS)
- $(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS)
- rm -f $(LIBDIR)/$(GL_LIB)*
- mv $(GL_LIB)* $(LIBDIR)
+ $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
+ -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
+ $(GL_LIB_DEPS) $(OBJECTS)
# Make the OSMesa library
$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
- if [ ${OSMESA_LIB} ] ; then $(MAKELIB) $(OSMESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(OSMESA_OBJECTS) ; fi
- if [ ${OSMESA_LIB} ] ; then rm -f $(LIBDIR)/$(OSMESA_LIB)* ; fi
- if [ ${OSMESA_LIB} ] ; then mv $(OSMESA_LIB)* $(LIBDIR) ; fi
+ if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \
+ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
+ -L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \
+ $(OSMESA_OBJECTS) ; fi
# Make an optional library with _just_ core objects
libmesa: $(LIBDIR)/$(MESA_LIB)
@@ -245,9 +258,10 @@ libmesa: $(LIBDIR)/$(MESA_LIB)
if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
+
$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
-include ../Make-config
+include $(TOP)/Make-config
include depend
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 15:44:20 +0000