From b3b725b1e6044d29fb5f484979766d1ef8a7fa9f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 15 Dec 2003 16:14:55 +0000
Subject: Assorted mklib tweaks. Added Intel icc support to mklib.

---
 src/glu/sgi/Makefile.X11  | 3 ++-
 src/glut/glx/Makefile.X11 | 2 +-
 src/glw/Makefile.X11      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 7202aa84ff..5102528585 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -142,7 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB)
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
 		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
-		$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) $(OBJECTS)
+		$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
+		$(MKLIB_OPTIONS) $(OBJECTS)
 
 
 
diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11
index 0ef132d451..89b920bea9 100644
--- a/src/glut/glx/Makefile.X11
+++ b/src/glut/glx/Makefile.X11
@@ -103,7 +103,7 @@ targets: $(LIBDIR)/$(GLUT_LIB)
 $(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
 		-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
-		$(OBJECTS)
+		$(MKLIB_OPTIONS) $(OBJECTS)
 
 include $(TOP)/Make-config
 
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index 888aebd52c..b38ef50d4c 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -46,7 +46,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
 # Make the library
 $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
-		-patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) $(OBJECTS)
+		-patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
+		$(MKLIB_OPTIONS) $(OBJECTS)
 
 
 message:
-- 
cgit v1.2.3