Commit 3ba8a49c authored by Brian Paul's avatar Brian Paul

Remove a bunch of really old/obsolete configs.

Use the new mklib script.
parent 8c20c7ba
This diff is collapsed.
# $Id: Makefile.X11,v 1.23 2003/04/21 14:04:27 brianp Exp $
# Mesa 3-D graphics library
# Version: 5.1
# Copyright (C) 1995-2003 Brian Paul
# Makefile for GLUT-based demo programs for Unix/X11
# Makefile for GLUT-based demo programs
##### 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)
OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
......@@ -71,7 +66,7 @@ PROGS = \
# make executable from .c file:
.c: $(LIB_DEP)
$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
# special case: need the -lOSMesa library:
osdemo: osdemo.c
......@@ -95,20 +90,10 @@ targets: readtex.c readtex.h $(PROGS)
readtex.c:
cp ../util/readtex.c .
cp $(TOP)/util/readtex.c .
readtex.h:
cp ../util/readtex.h .
# execute all programs
exec: $(PROGS)
@for prog in $(PROGS) ; \
do \
echo -n "Running $$prog ..." ; \
$$prog ; \
echo ; \
done
cp $(TOP)/util/readtex.h .
include ../Make-config
include $(TOP)/Make-config
# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.1
# Copyright (C) 1995-1998 Brian Paul
# Makefile for programs from the OpenGL Programming Guide
##### 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)
......@@ -33,7 +28,7 @@ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \
.SUFFIXES: .c
.c: $(LIB_DEP)
$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
......@@ -51,14 +46,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
# $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
# $Id: Makefile.X11,v 1.13 2002/10/05 18:30:46 brianp Exp $
# Mesa 3-D graphics library
# Version: 4.1
# Copyright (C) 1995-2002 Brian Paul
# Makefile for non-GLUT (X11, SVGA, etc) demo programs
##### MACROS #####
INCDIR = ../include
LIBDIR = ../lib
TOP = ..
INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib
GL_LIBS = -L$(LIBDIR) -lGLU -lGL $(APP_LIB_DEPS)
LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB)
......@@ -38,7 +33,24 @@ PROGS = glthreads \
.SUFFIXES: .c
.c: $(LIB_DEP)
$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
# special cases
pbinfo: pbinfo.o pbutil.o
$(CC) pbinfo.o pbutil.o $(LIBS) -o $@
pbdemo: pbdemo.o pbutil.o
$(CC) pbdemo.o pbutil.o $(LIBS) -o $@
pbinfo.o: pbinfo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
pbdemo.o: pbdemo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
pbutil.o: pbutil.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
......@@ -56,30 +68,7 @@ realclean:
targets: $(PROGS)
# execute all programs
exec: $(PROGS)
@for prog in $(PROGS) ; \
do \
echo -n "Running $$prog ..." ; \
$$prog ; \
echo ; \
done
include ../Make-config
pbinfo: pbinfo.o pbutil.o
$(CC) pbinfo.o pbutil.o $(GL_LIBS) -o $@
pbdemo: pbdemo.o pbutil.o
$(CC) pbdemo.o pbutil.o $(GL_LIBS) -o $@
include $(TOP)/Make-config
pbinfo.o: pbinfo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<
pbdemo.o: pbdemo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<
pbutil.o: pbutil.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $<
# $Id: Makefile.X11,v 1.8 2000/07/11 14:11:04 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.3
# Copyright (C) 1995-2000 Brian Paul
# Makefile for GLU library
# Makefile for old Mesa GLU library
##### MACROS #####
......@@ -15,8 +8,9 @@ GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
VPATH = RCS
INCDIR = ../include
LIBDIR = ../lib
TOP = ..
INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib
SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
polytest.c project.c quadric.c tess.c tesselat.c
......@@ -44,10 +38,11 @@ targets: $(LIBDIR)/$(GLU_LIB)
# Make the library:
$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
$(MAKELIB) $(GLU_LIB) $(GLU_MAJOR) $(GLU_MINOR) $(GLU_TINY) $(OBJECTS)
mv $(GLU_LIB)* $(LIBDIR)
$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-patch $(GLU_TINY) $(GLU_LIB_DEPS) -install $(LIBDIR) \
$(OBJECTS)
include ../Make-config
include $(TOP)/Make-config
include depend
......@@ -58,4 +53,4 @@ include depend
# by any source file.
#
dep: $(SOURCES)
makedepend -fdepend -Y -I../include $(SOURCES)
makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
# $Id: Makefile.X11,v 1.7 2002/01/08 15:58:32 brianp Exp $
# Mesa 3-D graphics library
# Version: 4.1
# Copyright (C) 1995-2002 Brian Paul
# Makefile for SGI SI GLU library
.SUFFIXES : .cc
......@@ -16,8 +10,9 @@ GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
VPATH = RCS
INCDIRS = -I../include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
LIBDIR = ../lib
TOP = ..
INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
LIBDIR = $(TOP)/lib
C_SOURCES = \
libutil/error.c \
......@@ -125,7 +120,7 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
$(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
.cc.o:
$(CPLUSPLUS) -c $(INCDIRS) $(CCFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
##### TARGETS #####
......@@ -143,11 +138,13 @@ targets: $(LIBDIR)/$(GLU_LIB)
# Make the library:
$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
$(MAKELIB) $(GLU_LIB) $(GLU_MAJOR) $(GLU_MINOR) $(GLU_TINY) $(OBJECTS)
rm -f $(LIBDIR)/$(GLU_LIB)*
mv $(GLU_LIB)* $(LIBDIR)
$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-patch $(GLU_TINY) $(GLU_LIB_DEPS) -cplusplus \
-install $(LIBDIR) $(OBJECTS)
include ../Make-config
include $(TOP)/Make-config
include depend
......@@ -158,4 +155,4 @@ include depend
# by any source file.
#
dep: $(SOURCES)
makedepend -fdepend -Y -I../include $(SOURCES)
makedepend -fdepend -Y -I$(TOP)/include $(SOURCES)
# $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
# Makefile for core library
# Makefile for GL library
##### MACROS #####
......@@ -15,8 +9,9 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
VPATH = RCS
INCDIR = ../include
LIBDIR = ../lib
TOP = ..
INCDIR = $(TOP)/include
LIBDIR = $(TOP)/lib
......@@ -45,6 +40,7 @@ CORE_SOURCES = \
eval.c \
extensions.c \
feedback.c \
fetchstate.c \
fog.c \
get.c \
glapi.c \
......@@ -228,16 +224,15 @@ 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 -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 \
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
-L$(LIBDIR) -lGL -install $(LIBDIR) $(OSMESA_OBJECTS) ; fi
# Make an optional library with _just_ core objects
libmesa: $(LIBDIR)/$(MESA_LIB)
......@@ -247,7 +242,7 @@ libmesa: $(LIBDIR)/$(MESA_LIB)
$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
include ../Make-config
include $(TOP)/Make-config
include depend
......@@ -258,7 +253,7 @@ include depend
# by any source file.
#
dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
makedepend -fdepend -Y -I../include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
makedepend -fdepend -Y -I$(TOP)/include -DGGI -DSVGA -DFX $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_SOURCES)
tags:
etags `find . -name \*.[ch]` `find ../include`
etags `find . -name \*.[ch]` `find $(TOP)/include`
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