From 8dcc6736aba672916bd4bc70a964c30bb11eeafa Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 25 Jul 2005 22:59:58 +0000
Subject: Added -linker option to mklib, used to specify a particular program
 for linking, if relevant. Updated Makefiles to use -linker option instead of
 setting CC, CXX env vars.

---
 src/glu/mesa/Makefile  | 4 ++--
 src/glu/sgi/Makefile   | 4 ++--
 src/glut/ggi/Makefile  | 2 +-
 src/glut/glx/Makefile  | 6 +++---
 src/glut/mini/Makefile | 6 +++---
 src/glw/Makefile       | 5 +++--
 src/glx/mini/Makefile  | 3 ++-
 src/glx/x11/Makefile   | 3 ++-
 src/mesa/Makefile      | 8 ++++----
 9 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index 0924cf8940..de6c0282bb 100644
--- a/src/glu/mesa/Makefile
+++ b/src/glu/mesa/Makefile
@@ -45,8 +45,8 @@ $(LIB_DIR):
 
 # Make the library:
 $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-	@CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
+	@ $(TOP)/bin/mklib -o $(GLU_LIB) -linker $(CC) \
+		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
 		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
 		$(GLU_LIB_DEPS) $(OBJECTS)
 
diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 19f5e280b7..30372c9592 100644
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -136,8 +136,8 @@ $(LIB_DIR):
 
 # Make the library:
 $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
+	$(TOP)/bin/mklib -o $(GLU_LIB) -linker $(CXX) \
+		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
 		-cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 		$(GLU_LIB_DEPS) $(OBJECTS)
 
diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile
index a5ffcecea8..f46da59ee9 100644
--- a/src/glut/ggi/Makefile
+++ b/src/glut/ggi/Makefile
@@ -32,7 +32,7 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
+	$(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
 		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
 		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 		$(GLUT_LIB_DEPS) $(OBJECTS)
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 2b7180493f..e345c8df40 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -90,9 +90,9 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+	$(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
 		$(GLUT_LIB_DEPS) $(OBJECTS)
 
 
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index c1dc5c5a05..ffd224e6f1 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -55,9 +55,9 @@ default: depend $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-		-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIB_DIR) \
+	$(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+		$(GLUT_LIB_DEPS) -install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(OBJECTS)
 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 4f1abf5d31..12719f7c72 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -33,8 +33,9 @@ clean:
 
 # Make the library
 $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
-		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+	$(TOP)/bin/mklib -o $(GLW_LIB) -linker $(CC) \
+		-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
+		$(MKLIB_OPTIONS) -install $(LIB_DIR) \
 		$(GLW_LIB_DEPS) $(OBJECTS)
 
 
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 612610526e..a9bced2508 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -55,7 +55,8 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+	$(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+		-major 1 -minor 2 $(MKLIB_OPTIONS) \
 		-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 	rm -f $(LIB_DIR)/miniglx.conf
 	install example.miniglx.conf $(LIB_DIR)/miniglx.conf
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index bca2ee4ffa..3ffa4780d4 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -88,7 +88,8 @@ dispatch.c:
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+	$(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+		-major 1 -minor 2 $(MKLIB_OPTIONS) \
 		-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 6e13f5289c..7a17bf5a61 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -96,7 +96,7 @@ LIBGL_CORE_OBJECTS = 	\
 
 # Make libGL from core object files
 libgl-core: $(LIBGL_CORE_OBJECTS)
-	@ CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \
+	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
 		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
 		-install $(LIB_DIR) $(MKLIB_OPTIONS) $(LIBGL_CORE_OBJECTS) $(GL_LIB_DEPS)
 
@@ -150,7 +150,7 @@ subdirs:
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-	@ CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \
+	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
@@ -158,13 +158,13 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
 	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-		CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \
 			-major $(MESA_MAJOR) \
 			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
 			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
 			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
 	else \
-		CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \
 			-major $(MESA_MAJOR) \
 			-minor $(MESA_MINOR) -patch $(GL_TINY) \
 			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
-- 
cgit v1.2.3