Commit 45e9a5c4 authored by Brian Paul's avatar Brian Paul
Browse files

Added GL_LIB_NAME / GLU_LIB_NAME so the default name for the libraries

can be overridden (Brad King).
parent 698e67d4
......@@ -6,6 +6,8 @@ GLU_MAJOR = 1
GLU_MINOR = 1
GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS
TOP = ..
......@@ -38,9 +40,9 @@ targets: $(LIBDIR)/$(GLU_LIB)
# Make the library:
$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-patch $(GLU_TINY) $(GLU_LIB_DEPS) -install $(LIBDIR) \
$(OBJECTS)
$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
-minor $(GLU_MINOR) -patch $(GLU_TINY) $(GLU_LIB_DEPS) \
-install $(LIBDIR) $(OBJECTS)
include $(TOP)/Make-config
......
......@@ -8,6 +8,8 @@ GLU_MAJOR = 1
GLU_MINOR = 3
GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
GLU_LIB_NAME = "GLU" # may be overridden in Make-config
VPATH = RCS
TOP = ..
......@@ -138,9 +140,9 @@ targets: $(LIBDIR)/$(GLU_LIB)
# Make the library:
$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
$(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-patch $(GLU_TINY) $(GLU_LIB_DEPS) -cplusplus \
-install $(LIBDIR) $(OBJECTS)
$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
-minor $(GLU_MINOR) -patch $(GLU_TINY) \
$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) $(OBJECTS)
......
......@@ -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
......
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