From 2f49a40a0777523e9d2bf810a6bdb0400a750a75 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 15 Sep 1999 15:11:01 +0000 Subject: [PATCH] added third, tiny version number to mklib scripts --- src/glu/mesa/Makefile.BeOS | 2 +- src/glu/mesa/Makefile.BeOS-R4 | 7 +++++-- src/glu/mesa/Makefile.X11 | 4 ++-- src/glut/glx/Makefile.X11 | 8 ++++++-- src/glut/glx/Makefile.cygnus | 7 ++++--- src/mesa/Makefile.X11 | 4 ++-- src/mesa/main/Makefile.X11 | 4 ++-- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/glu/mesa/Makefile.BeOS b/src/glu/mesa/Makefile.BeOS index 016bb580ae3..721ad943fbb 100644 --- a/src/glu/mesa/Makefile.BeOS +++ b/src/glu/mesa/Makefile.BeOS @@ -54,7 +54,7 @@ targets: $(LIBDIR)/$(GLU_LIB) # Make the library: $(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(MAKELIB) $(GLU_LIB) 2 6 $(OBJECTS) + $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) # $(RANLIB) $(GLU_LIB) mv $(GLU_LIB)* $(LIBDIR) diff --git a/src/glu/mesa/Makefile.BeOS-R4 b/src/glu/mesa/Makefile.BeOS-R4 index 4584c3201b8..13f024f5ec9 100644 --- a/src/glu/mesa/Makefile.BeOS-R4 +++ b/src/glu/mesa/Makefile.BeOS-R4 @@ -19,9 +19,12 @@ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# $Id: Makefile.BeOS-R4,v 1.2 1999/09/10 02:03:31 gareth Exp $ +# $Id: Makefile.BeOS-R4,v 1.3 1999/09/15 15:11:01 brianp Exp $ # $Log: Makefile.BeOS-R4,v $ +# Revision 1.3 1999/09/15 15:11:01 brianp +# added third, tiny version number to mklib scripts +# # Revision 1.2 1999/09/10 02:03:31 gareth # Added GLU 1.3 tessellation (except winding rule code). # @@ -63,7 +66,7 @@ targets: $(LIBDIR)/$(GLU_LIB) # Make the library: $(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) -L$(LIBDIR) -lMesaGL $(OBJECTS) + $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) -L$(LIBDIR) -lMesaGL $(OBJECTS) mv $(GLU_LIB)* $(LIBDIR) include ../Make-config diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11 index 2b123810a57..c5dd490dfae 100644 --- a/src/glu/mesa/Makefile.X11 +++ b/src/glu/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.2 1999/09/10 02:03:31 gareth Exp $ +# $Id: Makefile.X11,v 1.3 1999/09/15 15:11:01 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -40,7 +40,7 @@ targets: $(LIBDIR)/$(GLU_LIB) # Make the library: $(LIBDIR)/$(GLU_LIB): $(OBJECTS) - $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(OBJECTS) + $(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) mv $(GLU_LIB)* $(LIBDIR) include ../Make-config diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11 index 04676e04899..bcd7155e879 100644 --- a/src/glut/glx/Makefile.X11 +++ b/src/glut/glx/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.1 1999/08/19 14:00:01 brianp Exp $ +# $Id: Makefile.X11,v 1.2 1999/09/15 15:11:24 brianp Exp $ # Makefile for GLUT # @@ -16,6 +16,9 @@ # $Log: Makefile.X11,v $ +# Revision 1.2 1999/09/15 15:11:24 brianp +# added third, tiny version number to mklib scripts +# # Revision 1.1 1999/08/19 14:00:01 brianp # initial check-in (post crash) # @@ -25,6 +28,7 @@ GLUT_MAJOR = 3 GLUT_MINOR = 7 +GLUT_TINY = 0 VPATH = RCS @@ -104,7 +108,7 @@ targets: $(LIBDIR)/$(GLUT_LIB) # Make the library $(LIBDIR)/$(GLUT_LIB): $(OBJECTS) - $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(OBJECTS) + $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(GLUT_TINY) $(OBJECTS) mv $(GLUT_LIB)* $(LIBDIR) include ../Make-config diff --git a/src/glut/glx/Makefile.cygnus b/src/glut/glx/Makefile.cygnus index cf41987a55a..5d5fa6912c5 100644 --- a/src/glut/glx/Makefile.cygnus +++ b/src/glut/glx/Makefile.cygnus @@ -1,7 +1,7 @@ # Makefile.cygnus for Cygnus-Win32 target # /Stephane Rehel, November 16 1997 -# Makefile for GLUT 3.6 +# Makefile for GLUT 3.7 # # NOTICE: The OpenGL Utility Toolkit (GLUT) distribution contains source # code published in a book titled "Programming OpenGL for the X Window @@ -19,7 +19,8 @@ ##### MACROS ##### GLUT_MAJOR = 3 -GLUT_MINOR = 6 +GLUT_MINOR = 7 +GLUT_TINY = 0 VPATH = RCS @@ -92,7 +93,7 @@ targets: $(LIBDIR)/$(GLUT_LIB) # Make the library $(LIBDIR)/$(GLUT_LIB): $(OBJECTS) - $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(OBJECTS) + $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(GLUT_TINY) $(OBJECTS) mv $(GLUT_LIB)* $(LIBDIR) include ../Make-config diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 56df7256e30..790e7881bc3 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.2 1999/09/07 21:32:30 brianp Exp $ +# $Id: Makefile.X11,v 1.3 1999/09/15 15:11:52 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -222,7 +222,7 @@ targets: $(LIBDIR)/$(GL_LIB) # Make the library $(LIBDIR)/$(GL_LIB): $(OBJECTS) - $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(OBJECTS) + $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) rm -f $(LIBDIR)/$(GL_LIB)* mv $(GL_LIB)* $(LIBDIR) diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index 56df7256e30..790e7881bc3 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.2 1999/09/07 21:32:30 brianp Exp $ +# $Id: Makefile.X11,v 1.3 1999/09/15 15:11:52 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -222,7 +222,7 @@ targets: $(LIBDIR)/$(GL_LIB) # Make the library $(LIBDIR)/$(GL_LIB): $(OBJECTS) - $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(OBJECTS) + $(MAKELIB) $(GL_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) rm -f $(LIBDIR)/$(GL_LIB)* mv $(GL_LIB)* $(LIBDIR) -- 2.30.2