make null-terminated copy of program string so that parse works correctly
[mesa.git] / Make-config
index 0bb796547880d919c15283573c14e62d7b1fb190..209db45588c710fc696e96edc514d6f669a630e8 100644 (file)
@@ -9,7 +9,7 @@
 
 
 MESA_MAJOR=6
-MESA_MINOR=0
+MESA_MINOR=1
 MESA_TINY=0
 VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 
@@ -30,13 +30,13 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 # GLU_LIB_DEPS   list of libraries which the GLU library depends on
 # GLUT_LIB_DEPS  list of libraries which the GLUT library depends on
 # GLW_LIB_DEPS   list of libraries which the GLw (Xt/OpenGL) library depends on
+# OSMESA_LIB_DEPS list of libraries which OSMesa depends on (optional)
 # APP_LIB_DEPS   list of libraries which demo programs depend upon
-# ASM_SOURCES    optional list of assembly language files to assemble
-# MAKELIB        the script or command to make a library file
-#                XXX MAKELIB is obsolete; edit bin/mklib to support new systems
+# ASM_SOURCES    optional list of assembly language files to assemble for libGL
 # MKLIB_OPTIONS  extra options to pass to the mklib script (like -arch)
 
 
+# XXX probably out of date
 aix:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -45,10 +45,57 @@ aix:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
+       "CXX = xlC" \
+       "CFLAGS = -O -DAIXV3 -DPTHREADS" \
+       "CXXFLAGS = -O -DAIXV3 -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = xlC" \
        "CFLAGS = -O -DAIXV3" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
+       "CXXFLAGS = -O -DAIXV3" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-64:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = xlC" \
+       "CFLAGS = -q64 -O -DAIXV3 -DPTHREADS" \
+       "CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS" \
+       "MKLIB_OPTIONS = -static -arch AIX64" \
+       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
+aix-64-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = xlC" \
+       "CFLAGS = -q64 -O -DAIXV3" \
+       "CXXFLAGS = -q64 -O -DAIXV3" \
+       "MKLIB_OPTIONS = -static -arch AIX64" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
+# XXX probably out of date
 aix-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -58,9 +105,25 @@ aix-sl:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O -DAIXV3" \
-       "MAKELIB = $(TOP)/bin/mklib.aix" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
+aix-gcc:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "CC = gcc" \
+       "CFLAGS = -O2 -DAIXV3" \
+       "CXX = g++" \
+       "CXXFLAGS = -O2 -DAIXV3" \
+       "MKLIB_OPTIONS = -arch aix-gcc" \
+       "GL_LIB_DEPS = -lX11 -lXext -lm" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lXi -lXmu" \
+       "APP_LIB_DEPS = -Wl,-brtl -lglut -lGLU -lGL -lm -lX11 -lXext -lXmu -lXi"
+
 beos-r4:
        $(MAKE) -f Makefile.BeOS-R4 targets \
        "GL_LIB = libGL.so" \
@@ -91,7 +154,6 @@ cygnus:
                -O2 -funroll-loops \
                -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
 cygnus-linux:
@@ -108,7 +170,6 @@ cygnus-linux:
        "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
                -O2 -funroll-loops \
                -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
-       "MAKELIB = $(TOP)/bin/mklib.cygnus-linux" \
        "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
 darwin:
@@ -131,6 +192,44 @@ darwin:
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL \
                        -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" 
 
+darwin-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -I/sw/include -I/usr/X11R6/include -O3 -fPIC -fno-common \
+               -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+               -Ddarwin -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "CXXFLAGS = $(CFLAGS)" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm"
+
+darwin-static-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -I/sw/include -I/usr/X11R6/include -O3 -fPIC -fno-common \
+               -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+               -Ddarwin -DUSE_XSHM -I/usr/X11R6/include" \
+       "CXXFLAGS = $(CFLAGS)" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm"
+
 freebsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -172,7 +271,6 @@ gcc-sl:
        "CFLAGS = -fPIC -O3" \
        "CXXFLAGS = -fPIC -O3" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \
        "APP_LIB_DEPS = -lX11 -lm"
 
 #special hidden target, to make a shared lib for ONLY Mesa "core"
@@ -181,8 +279,7 @@ gcc-mesa-sl:
        "MESA_LIB = libMesa.so" \
        "CC = gcc" \
        "CFLAGS = -fPIC -O3" \
-       "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \
+       "GLUT_CFLAGS = -fexceptions"
 
 hpux9:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -193,7 +290,6 @@ hpux9:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-gcc:
@@ -208,7 +304,6 @@ hpux9-gcc:
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
        "CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-sl:
@@ -248,7 +343,6 @@ hpux10:
        "CXX = aCC" \
        "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
        "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup"
 
 hpux10-sl:
@@ -276,7 +370,6 @@ hpux10-gcc:
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM" \
        "CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-gcc-sl:
@@ -293,6 +386,93 @@ hpux10-gcc-sl:
        "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
+hpux11-32:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-32-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-64:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-64-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DA2.0W -Ae -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -D_USE_ISFINITE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-ia64:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+
+hpux11-ia64-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 # IRIX 6 32-bit Targets
 #      Turn Warnings off for these errors (MIPSpro Compiler 7.30)
@@ -314,6 +494,7 @@ irix6-o32:
        "CXX = CC" \
        "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
        "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+       "MKLIB_OPTIONS = -archopt o32 -static" \
        "APP_LIB_DEPS = -32 -glut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-o32-dso:
@@ -328,6 +509,7 @@ irix6-o32-dso:
        "CXX = CC" \
        "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
        "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+       "MKLIB_OPTIONS = -archopt o32" \
        "APP_LIB_DEPS = -32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32:
@@ -340,8 +522,24 @@ irix6-n32:
        "LIBDIR = $(TOP)/lib32" \
        "CC = cc" \
        "CXX = CC" \
-       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREAD" \
+       "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREAD" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lpthread"
+
+irix6-n32-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib32" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \
        "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \
+       "MKLIB_OPTIONS = -static" \
        "APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32-dso:
@@ -382,6 +580,21 @@ irix6-gcc-n32-sl:
 #   1474 - declaring a void parameter list with a typedef is nonstandard
 #   1552 - variable was set but never used
 irix6-64:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREAD" \
+       "CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREAD" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lpthread"
+
+irix6-64-nothreads:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
@@ -393,6 +606,7 @@ irix6-64:
        "CXX = CC" \
        "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
        "CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+       "MKLIB_OPTIONS = -archopt 64 -static" \
        "APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-64-dso:
@@ -407,8 +621,23 @@ irix6-64-dso:
        "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
        "CXX = CC" \
        "CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+       "MKLIB_OPTIONS = -archopt 64" \
        "APP_LIB_DEPS = -64 -rpath $(TOP)/lib64 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lm"
 
+irix6-mgl-n32-dso:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "LIBDIR = $(TOP)/libMGL32" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -n32 -DUSE_MGL_NAMESPACE -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+       "CXXFLAGS = -n32 -DUSE_MGL_NAMESPACE -mips3 -O3 -ansi -woff 1174,1552" \
+       "APP_LIB_DEPS = -n32 -rpath $(TOP)/libMGL32 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lfpe -lm" 
+
 linux:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -425,7 +654,26 @@ linux:
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
-       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm"
+
+linux-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = " \
+       "GLU_LIB_DEPS = " \
+       "GLUT_LIB_DEPS = " \
+       "GLW_LIB_DEPS = " \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXext -lXi -lXmu -lpthread -lm -lstdc++" \
+       "MKLIB_OPTIONS = -static"
 
 linux-x86:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -446,6 +694,78 @@ linux-x86:
        "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
        "ASM_SOURCES = $(X86_SOURCES)"
 
+linux-x86-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
+       "CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "MKLIB_OPTIONS = -static" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+       "ASM_SOURCES = $(X86_SOURCES)"
+
+linux-x86-static-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/X11R6/include" \
+       "CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "MKLIB_OPTIONS = -static" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm " \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+       "ASM_SOURCES = $(X86_SOURCES)"
+
+linux-x86-64-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CPLUSPLUS = g++" \
+       "CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm"
+
+linux-x86-64-static-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CPLUSPLUS = g++" \
+       "CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm"
+
 linux-x86-sse:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -481,6 +801,42 @@ linux-icc:
        "ASM_SOURCES = $(X86_SOURCES)" \
        "MKLIB_OPTIONS = -arch icc"
 
+linux-icc-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = icc" \
+       "CXX = icpc" \
+       "CFLAGS = -O3 -tpp6 -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+       "ASM_SOURCES = $(X86_SOURCES)" \
+       "MKLIB_OPTIONS = -static -arch icc"
+
+linux-icc-static-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = icc" \
+       "CXX = icpc" \
+       "CFLAGS = -O3 -tpp6 -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
+       "ASM_SOURCES = $(X86_SOURCES)" \
+       "MKLIB_OPTIONS = -static -arch icc"
+
 # Contributed by Uwe_Maurer@t-online.de
 linux-ggi:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -494,7 +850,7 @@ linux-ggi:
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \
        "CXXFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DCDECL=" \
        "GLUT_CFLAGS = -fexceptions" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lpthread" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lggi -lX11 -lXext -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm"
@@ -512,7 +868,7 @@ linux-x86-ggi:
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
        "CXXFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DCDECL=" \
        "GLUT_CFLAGS = -fexceptions" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lpthread" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lggi -lX11 -lXext -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm" \
@@ -568,6 +924,42 @@ linux-x86-glide:
        "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
        "ASM_SOURCES = $(X86_SOURCES)"
 
+linux-ia64-ecc-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = ecc" \
+       "CPLUSPLUS = ecpc" \
+       "CFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "CXXFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm" \
+       "ASM_SOURCES ="
+
+linux-ia64-ecc-static-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = ecc" \
+       "CPLUSPLUS = ecpc" \
+       "CFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+       "CXXFLAGS = -O3 -ansi -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lm" \
+       "ASM_SOURCES ="
+
 linux-alpha:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -598,7 +990,6 @@ linux-alpha-static:
        "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \
        "CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lm"
 
 linux-ppc:
@@ -631,7 +1022,6 @@ linux-ppc-static:
        "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
        "CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm"
 
 linux-sparc:
@@ -710,8 +1100,8 @@ linux-osmesa16-static:
        "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread" \
-       "MAKELIB_FLAGS = -static" \
-       "APP_LIB_DEPS = -lOSMesa16 -lGL"
+       "APP_LIB_DEPS = -lOSMesa16 -lGL" \
+       "MKLIB_OPTIONS = -static"
 
 # 32-bit/channel Mesa using OSMesa driver
 linux-osmesa32:
@@ -771,7 +1161,6 @@ mklinux:
        "CFLAGS = -pedantic -O2" \
        "CXXFLAGS = -pedantic -O2" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
 
 netbsd:
@@ -795,12 +1184,15 @@ openbsd:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
-       "CC = cc" \
+       "CC = gcc" \
+       "CXX = g++" \
        "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm" \
+       "CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm" \
+       "OSMESA_LIB_DEPS = -lm" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL" \
-       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL" \
-       "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -L/usr/X11R6/lib -lglut -lGLU -lGL -lm"
 
 openstep:      
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -809,8 +1201,7 @@ openstep:
        "GLU_LIB = libGLU.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = ${MYCC}" \
-       "CFLAGS = -traditional-cpp -DOPENSTEP -O4" \
-       "MAKELIB = $(TOP)/bin/mklib.openstep"
+       "CFLAGS = -traditional-cpp -DOPENSTEP -O4"
 
 openstep-win32:        
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -822,23 +1213,42 @@ openstep-win32:
        "CXX = g++" \
        "CFLAGS = -DOPENSTEP -O4" \
        "CXXFLAGS = -DOPENSTEP -O4" \
-       "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.openstep"
+       "GLUT_CFLAGS = -fexceptions"
 
 osf1:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.so" \
-       "GLU_LIB = libGLU.so" \
-       "GLUT_LIB = libglut.so" \
-       "GLW_LIB = libGLw.so" \
-       "OSMESA_LIB = libOSMesa.so" \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
-       "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
+       "CXX = cxx" \
+       "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DPTHREADS -D_REENTRANT -DUSE_XSHM" \
+       "CXXFLAGS = -O0 -std1 -ieee_with_no_inexact -DPTHREADS -D_REENTRANT -DUSE_XSHM" \
+       "MKLIB_OPTIONS = -static" \
        "GL_LIB_DEPS = -lX11 -lXext -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
+osf1-nothreads:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = cxx" \
+       "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
+       "CXXFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
+       "MKLIB_OPTIONS = -static" \
+       "GL_LIB_DEPS = -lX11 -lXext -lm" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+
 # QNX V4 & Watcom Compiler
 qnx:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -849,7 +1259,6 @@ qnx:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O" \
-       "MAKELIB = $(TOP)/bin/mklib.qnx" \
        "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
 
 solaris-x86:
@@ -875,7 +1284,10 @@ solaris-x86-gcc:
        "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \
        "CXXFLAGS = -O3 -m486 -fPIC" \
        "GLUT_CFLAGS = -fexceptions" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+       "GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm" \
+       "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lglut -lGLU -lGL -lm"
 
 sunos4:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -886,7 +1298,6 @@ sunos4:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = acc" \
        "CFLAGS = -O -DUSE_XSHM -DSUNOS4" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-sl:
@@ -898,7 +1309,6 @@ sunos4-sl:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = acc" \
        "CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4" \
-       "MAKELIB = ld -assert pure-text -o" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc:
@@ -913,7 +1323,6 @@ sunos4-gcc:
        "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \
        "CXXFLAGS = -O3 -DSUNOS4 -I/usr/openwin/include" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc-sl:
@@ -928,7 +1337,6 @@ sunos4-gcc-sl:
        "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4" \
        "CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4" \
        "GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG" \
-       "MAKELIB = $(TOP)/bin/mklib.sunos4" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc-x11r6-sl:
@@ -943,7 +1351,6 @@ sunos4-gcc-x11r6-sl:
        "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4" \
        "CXXFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DSUNOS4" \
        "GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG" \
-       "MAKELIB = $(TOP)/bin/mklib.sunos4" \
        "APP_LIB_DEPS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5:
@@ -964,6 +1371,64 @@ sunos5:
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
        "APP_LIB_DEPS = -lCrun -lX11 -lglut -lGLU -lGL -lm"
 
+sunos5-v8:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -xarch=v8 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "CXXFLAGS = -xarch=v8 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+
+sunos5-v9:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -xarch=v9 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "CXXFLAGS = -xarch=v9 -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+
+sunos5-v8-pthread:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -xarch=v8 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+       "CXXFLAGS = -xarch=v8 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+
+sunos5-v9-pthread:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "LIBDIR = $(TOP)/lib64" \
+       "CC = cc" \
+       "CXX = CC" \
+       "CFLAGS = -xarch=v9 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+       "CXXFLAGS = -xarch=v9 -mt -Xa -xO4 -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
+       "MKLIB_OPTIONS = -static" \
+       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+
 sunos5-smp:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -992,7 +1457,7 @@ sunos5-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM" \
-       "CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame_pointer -D_REENTRANT" \
+       "CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT" \
        "GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG" \
        "GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
@@ -1030,7 +1495,6 @@ ultrix-gcc:
        "CFLAGS = -pedantic -O2" \
        "CXXFLAGS = -pedantic -O2" \
        "GLUT_CFLAGS = -fexceptions" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
 
 unixware:
@@ -1043,7 +1507,6 @@ unixware:
        "CC = cc" \
        "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \
        "CXXFLAGS = -O" \
-       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
 unixware-shared: