summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-06-02 15:21:16 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-06-02 15:21:16 +0000
commit45e9a5c46b8e18e7815ce69d0c2da9200b323f0f (patch)
tree2ae4155a16c89daf583c9e5dca01fe1a260736ab
parent698e67d40996b48720453337826c7da9972437ab (diff)
Added GL_LIB_NAME / GLU_LIB_NAME so the default name for the libraries
can be overridden (Brad King).
-rw-r--r--src/glu/mesa/Makefile.X118
-rw-r--r--src/glu/sgi/Makefile.X118
-rw-r--r--src/mesa/main/Makefile.X117
3 files changed, 15 insertions, 8 deletions
diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index c16464fe9f..3ba1570482 100644
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -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
diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 2925d6eaa2..9c79d0d6fc 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -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)
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index ce71d9b111..af3ae12c8a 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