summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-06-02 15:21:16 +0000
committerBrian Paul <[email protected]>2003-06-02 15:21:16 +0000
commit45e9a5c46b8e18e7815ce69d0c2da9200b323f0f (patch)
tree2ae4155a16c89daf583c9e5dca01fe1a260736ab /src/mesa
parent698e67d40996b48720453337826c7da9972437ab (diff)
Added GL_LIB_NAME / GLU_LIB_NAME so the default name for the libraries
can be overridden (Brad King).
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/Makefile.X117
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index ce71d9b111e..af3ae12c8a9 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -7,6 +7,8 @@ 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
+
VPATH = RCS
TOP = ..
@@ -223,8 +225,9 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)
# Make the GL library
$(LIBDIR)/$(GL_LIB): $(OBJECTS)
- $(TOP)/bin/mklib -o GL -major $(GL_MAJOR) -minor $(GL_MINOR) \
- -patch $(GL_TINY) -install $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
+ $(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