Commit b953bebc authored by Brian Paul's avatar Brian Paul
Browse files

updated old-style makefiles for new tree

parent 9ac51f57
This diff is collapsed.
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
##### MACROS ##### ##### MACROS #####
TOP = .. TOP = ../..
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
...@@ -90,10 +90,10 @@ targets: readtex.c readtex.h $(PROGS) ...@@ -90,10 +90,10 @@ targets: readtex.c readtex.h $(PROGS)
readtex.c: readtex.c:
cp $(TOP)/util/readtex.c . cp $(TOP)/progs/util/readtex.c .
readtex.h: readtex.h:
cp $(TOP)/util/readtex.h . cp $(TOP)/progs/util/readtex.h .
include $(TOP)/Make-config include $(TOP)/Make-config
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
##### MACROS ##### ##### MACROS #####
TOP = .. TOP = ../..
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
##### MACROS ##### ##### MACROS #####
TOP = .. TOP = ../..
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
##### MACROS ##### ##### MACROS #####
TOP = .. TOP = ../..
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
......
...@@ -10,7 +10,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config ...@@ -10,7 +10,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS VPATH = RCS
TOP = .. TOP = ../../..
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
......
...@@ -12,7 +12,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config ...@@ -12,7 +12,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS VPATH = RCS
TOP = .. TOP = ../../..
INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
LIBDIR = $(TOP)/lib LIBDIR = $(TOP)/lib
......
# $Id: Makefile.X11,v 1.3 2002/08/17 00:20:48 brianp Exp $
# Makefile for GLUT # Makefile for GLUT
# #
# NOTICE: The OpenGL Utility Toolkit (GLUT) distribution contains source # NOTICE: The OpenGL Utility Toolkit (GLUT) distribution contains source
...@@ -23,8 +21,9 @@ GLUT_TINY = 1 ...@@ -23,8 +21,9 @@ GLUT_TINY = 1
VPATH = RCS VPATH = RCS
INCDIR = ../include TOP = ../../..
LIBDIR = ../lib INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib
SOURCES = \ SOURCES = \
glut_8x13.c \ glut_8x13.c \
...@@ -102,10 +101,11 @@ targets: $(LIBDIR)/$(GLUT_LIB) ...@@ -102,10 +101,11 @@ targets: $(LIBDIR)/$(GLUT_LIB)
# Make the library # Make the library
$(LIBDIR)/$(GLUT_LIB): $(OBJECTS) $(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
$(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(GLUT_TINY) $(OBJECTS) $(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
mv $(GLUT_LIB)* $(LIBDIR) -patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
$(OBJECTS)
include ../Make-config include $(TOP)/Make-config
include depend include depend
...@@ -116,4 +116,4 @@ include depend ...@@ -116,4 +116,4 @@ include depend
# by any source file. # by any source file.
# #
dep: $(SOURCES) dep: $(SOURCES)
makedepend -fdepend -Y -I../include $(SOURCES) makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
...@@ -7,10 +7,12 @@ MAJOR = 1 ...@@ -7,10 +7,12 @@ MAJOR = 1
MINOR = 0 MINOR = 0
TINY = 0 TINY = 0
TOP = ../..
VPATH = RCS VPATH = RCS
INCDIRS = -I../include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
LIBDIR = ../lib LIBDIR = $(TOP)/lib
# Use these sources for Motif (and Xt) support. Requires Motif header files. # Use these sources for Motif (and Xt) support. Requires Motif header files.
#SOURCES = GLwDrawA.c GLwMDrawA.c #SOURCES = GLwDrawA.c GLwMDrawA.c
...@@ -43,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message ...@@ -43,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
# Make the library # Make the library
$(LIBDIR)/$(GLW_LIB): $(OBJECTS) $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
$(MAKELIB) $(GLW_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
mv $(GLW_LIB)* $(LIBDIR) -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) $(OBJECTS)
-mv *.a $(LIBDIR)
message: message:
...@@ -56,7 +57,7 @@ message: ...@@ -56,7 +57,7 @@ message:
@echo @echo
include ../Make-config include $(TOP)/Make-config
include depend include depend
...@@ -67,4 +68,4 @@ include depend ...@@ -67,4 +68,4 @@ include depend
# by any source file. # by any source file.
# #
dep: $(SOURCES) dep: $(SOURCES)
makedepend -fdepend -Y -I../include $(SOURCES) makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
# DO NOT DELETE # DO NOT DELETE
GLwDrawA.o: ../include/GL/glx.h ../include/GL/gl.h ../include/GL/xmesa.h GLwDrawA.o: ../../include/GL/glx.h ../../include/GL/gl.h
GLwDrawA.o: GLwDrawAP.h GLwDrawA.h GLwDrawA.o: ../../include/GL/glext.h ../../include/GL/glxext.h GLwDrawAP.h
GLwMDrawA.o: GLwDrawA.c ../include/GL/glx.h ../include/GL/gl.h GLwDrawA.o: GLwDrawA.h
GLwMDrawA.o: ../include/GL/xmesa.h GLwDrawAP.h GLwDrawA.h GLwMDrawAP.h
# $Id: Makefile.X11,v 1.79 2003/04/17 02:33:11 brianp Exp $
# Mesa 3-D graphics library # Mesa 3-D graphics library
# Version: 5.1 # Version: 5.1
# Copyright (C) 1995-2003 Brian Paul # Copyright (C) 1995-2003 Brian Paul
...@@ -9,77 +7,81 @@ ...@@ -9,77 +7,81 @@
##### MACROS ##### ##### MACROS #####
TOP = ../..
GL_MAJOR = 1 GL_MAJOR = 1
GL_MINOR = 4 GL_MINOR = 4
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) 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 VPATH = RCS
INCDIR = ../include LIBDIR = $(TOP)/lib
LIBDIR = ../lib
CORE_SOURCES = \ CORE_SOURCES = \
api_arrayelt.c \ glapi/glapi.c \
api_loopback.c \ glapi/glthread.c \
api_noop.c \ main/api_arrayelt.c \
api_validate.c \ main/api_loopback.c \
accum.c \ main/api_noop.c \
arbprogram.c \ main/api_validate.c \
attrib.c \ main/accum.c \
blend.c \ main/arbprogram.c \
bufferobj.c \ main/attrib.c \
buffers.c \ main/blend.c \
clip.c \ main/bufferobj.c \
colortab.c \ main/buffers.c \
context.c \ main/clip.c \
convolve.c \ main/colortab.c \
debug.c \ main/context.c \
depth.c \ main/convolve.c \
dispatch.c \ main/debug.c \
dlist.c \ main/depth.c \
drawpix.c \ main/dispatch.c \
enable.c \ main/dlist.c \
enums.c \ main/drawpix.c \
eval.c \ main/enable.c \
extensions.c \ main/enums.c \
feedback.c \ main/eval.c \
fog.c \ main/extensions.c \
get.c \ main/feedback.c \
glapi.c \ main/fog.c \
glthread.c \ main/get.c \
hash.c \ main/hash.c \
hint.c \ main/hint.c \
histogram.c \ main/histogram.c \
image.c \ main/image.c \
imports.c \ main/imports.c \
light.c \ main/light.c \
lines.c \ main/lines.c \
matrix.c \ main/matrix.c \
nvprogram.c \ main/nvprogram.c \
nvfragparse.c \ main/nvfragparse.c \
nvvertexec.c \ main/nvvertexec.c \
nvvertparse.c \ main/nvvertparse.c \
pixel.c \ main/pixel.c \
points.c \ main/points.c \
polygon.c \ main/polygon.c \
rastpos.c \ main/rastpos.c \
state.c \ main/state.c \
stencil.c \ main/stencil.c \
texcompress.c \ main/texcompress.c \
texformat.c \ main/texformat.c \
teximage.c \ main/teximage.c \
texobj.c \ main/texobj.c \
texstate.c \ main/texstate.c \
texstore.c \ main/texstore.c \
texutil.c \ main/texutil.c \
varray.c \ main/varray.c \
vtxfmt.c \ main/vtxfmt.c \
X86/x86.c \ x86/x86.c \
X86/common_x86.c \ x86/common_x86.c \
X86/3dnow.c \ x86/3dnow.c \
X86/sse.c \ x86/sse.c \
math/m_debug_clip.c \ math/m_debug_clip.c \
math/m_debug_norm.c \ math/m_debug_norm.c \
math/m_debug_xform.c \ math/m_debug_xform.c \
...@@ -146,29 +148,29 @@ CORE_SOURCES = \ ...@@ -146,29 +148,29 @@ CORE_SOURCES = \
DRIVER_SOURCES = \ DRIVER_SOURCES = \
FX/fxapi.c \ drivers/glide/fxapi.c \
FX/fxdd.c \ drivers/glide/fxdd.c \
FX/fxddspan.c \ drivers/glide/fxddspan.c \
FX/fxddtex.c \ drivers/glide/fxddtex.c \
FX/fxsetup.c \ drivers/glide/fxsetup.c \
FX/fxtexman.c \ drivers/glide/fxtexman.c \
FX/fxtris.c \ drivers/glide/fxtris.c \
FX/fxvb.c \ drivers/glide/fxvb.c \
FX/fxglidew.c \ drivers/glide/fxglidew.c \
X/glxapi.c \ drivers/x11/glxapi.c \
X/fakeglx.c \ drivers/x11/fakeglx.c \
X/xfonts.c \ drivers/x11/xfonts.c \
X/xm_api.c \ drivers/x11/xm_api.c \
X/xm_dd.c \ drivers/x11/xm_dd.c \
X/xm_line.c \ drivers/x11/xm_line.c \
X/xm_span.c \ drivers/x11/xm_span.c \
X/xm_tri.c \ drivers/x11/xm_tri.c \
SVGA/svgamesa.c \ drivers/svga/svgamesa.c \
SVGA/svgamesa8.c \ drivers/svga/svgamesa8.c \
SVGA/svgamesa15.c \ drivers/svga/svgamesa15.c \
SVGA/svgamesa16.c \ drivers/svga/svgamesa16.c \
SVGA/svgamesa24.c \ drivers/svga/svgamesa24.c \
SVGA/svgamesa32.c drivers/svga/svgamesa32.c
ASM_SOURCES = ASM_SOURCES =
...@@ -182,18 +184,28 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \ ...@@ -182,18 +184,28 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \
CORE_OBJECTS = $(CORE_SOURCES:.c=.o) CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
OSMESA_SOURCES = OSmesa/osmesa.c OSMESA_SOURCES = drivers/osmesa/osmesa.c
OSMESA_OBJECTS = OSmesa/osmesa.o 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 ##### ##### RULES #####
.c.o: .c.o:
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
.S.o: .S.o:
$(CC) -c -I. $(CFLAGS) $< -o $@ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
X86/x86.o: X86/x86.c X86/x86.o: X86/x86.c
...@@ -228,16 +240,17 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) ...@@ -228,16 +240,17 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
# Make the GL library # Make the GL library
$(LIBDIR)/$(GL_LIB): $(OBJECTS) $(LIBDIR)/$(GL_LIB): $(OBJECTS)
$(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS) $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
rm -f $(LIBDIR)/$(GL_LIB)* -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
mv $(GL_LIB)* $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
# Make the OSMesa library # Make the OSMesa library
$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) $(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 $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \
if [ ${OSMESA_LIB} ] ; then rm -f $(LIBDIR)/$(OSMESA_LIB)* ; fi -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
if [ ${OSMESA_LIB} ] ; then mv $(OSMESA_LIB)* $(LIBDIR) ; fi -L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \
$(OSMESA_OBJECTS) ; fi
# Make an optional library with _just_ core objects # Make an optional library with _just_ core objects
libmesa: $(LIBDIR)/$(MESA_LIB) libmesa: $(LIBDIR)/$(MESA_LIB)
...@@ -245,9 +258,10 @@ 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 rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS) $(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
include ../Make-config include $(TOP)/Make-config
include depend include depend
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment