diff options
| author | Brian Paul <[email protected]> | 2003-06-01 16:25:02 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-06-01 16:25:02 +0000 |
| commit | 3ba8a49c810d5976c705160e8c96ae682ab85250 (patch) | |
| tree | bbd9a43eef9f973284e88a7fb9c0c8fa2c8cc9e7 /src/glu | |
| parent | 8c20c7ba0c786c816d9a5c826da318beb2d2c0b7 (diff) | |
Remove a bunch of really old/obsolete configs.
Use the new mklib script.
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/mesa/Makefile.X11 | 23 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile.X11 | 25 |
2 files changed, 20 insertions, 28 deletions
diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11 index e8a4e18c428..c16464fe9f0 100644 --- a/src/glu/mesa/Makefile.X11 +++ b/src/glu/mesa/Makefile.X11 @@ -1,11 +1,4 @@ -# $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) diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11 index 5481b508c76..2925d6eaa23 100644 --- a/src/glu/sgi/Makefile.X11 +++ b/src/glu/sgi/Makefile.X11 @@ -1,9 +1,3 @@ -# $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) |