projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
don't use new glDrawPixel routines in Xserver
[mesa.git] / Make-config
diff --git a/Make-config b/Make-config
index af45b17d132aa190328c9b9e3441d2239843f7f6..5f20adbc9fd12e5fe9c006332633e4ceeacb516c 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,64 +1,39 @@
-# $Id: Make-config,v 1.38 2001/03/28 20:44:43 gareth Exp $
+# Mesa Make-config file
 
-MESA_MAJOR=3
-MESA_MINOR=5
+# This file describes the compiler options, etc needed to build Mesa
+# on various systems using conventional Makefiles (not autoconf/automake).
+#
+# To add a new system configuration use an existing config as an example,
+# then update the top-level Makefile.X11 file.  You may also have to add
+# new platform support to the bin/mklib script.
+
+
+MESA_MAJOR=5
+MESA_MINOR=1
 MESA_TINY=0
 VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 
-# Mesa 3-D graphics library
-# 
-# Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-# The following variables are passed to each Makefile:
+
+# The following variables should be defined for each configuration:
 #
 # GL_LIB         the name of the Mesa "GL" library file (usually libGL.so)
 # GLU_LIB        the name of the Mesa "GLU" library file (usually libGLU.so)
 # GLUT_LIB       the name of the GLUT library file (usually libglut.so)
 # GLW_LIB        the name of the GLw widget library file (usually libGLw.so)
 # CC             the C compiler (usually cc or gcc)
-# CFLAGS         flags to C compiler (usually -O)
-# MAKELIB        the script or command to make a library file
+# CXX            the C++ compiler (usuall c++ or g++ or CC)
+# CFLAGS         options for C compiler (like -O)
+# CXXFLAGS       options for the C++ compiler (like -O)
+# GLUT_CFLAGS    extra flags for compiling GLUT
 # GL_LIB_DEPS    list of libraries which the GL library depends on
 # 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
 # APP_LIB_DEPS   list of libraries which demo programs depend upon
 # ASM_SOURCES    optional list of assembly language files to assemble
-#
-#
-# Optionally, you can add definitions for the INCDIR and LIBDIR variables
-# which specify where to find the Mesa include files and where to put the
-# Mesa libraries.  The defaults are ../include and ../lib.  This use of
-# overriding makefile macros on the command line should work with most
-# variants of make.
-#
-# If your system supports the X Shared Memory extension add -DUSE_XSHM to the
-# CFLAGS line and add -lXext to the GL_LIB_DEPS line.
-#
-# Some compilers complain about const parameters.  Adding -DNO_CONST to the
-# CFLAGS line should silence suth warnings.
-#
-#
-# To add a new system configuration just follow the examples below and update
-# the top-level Makefile.X11 file.
-
+# MAKELIB        the script or command to make a library file
+#                XXX MAKELIB is obsolete; edit bin/mklib to support new systems
+# MKLIB_OPTIONS  extra options to pass to the mklib script (like -arch)
 
 
 aix:
@@ -70,7 +45,7 @@ aix:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O -DAIXV3" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 aix-sl:
@@ -82,28 +57,9 @@ aix-sl:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O -DAIXV3" \
-       "MAKELIB = ../bin/mklib.aix" \
+       "MAKELIB = $(TOP)/bin/mklib.aix" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
-# Make-config additions for the Amiga 3000 UX
-# Carlyn Voss Iuzzolino   5/8/95: 
-# Modified gcc part as follows:
-# Needed to take out -pedantic because that makes gcc complain about 
-# ANSI-CC not allowing #ident in Amiga's /usr/include/*.h files.
-# Took out -O2 (unrecognized option for gcc on the Amiga).
-# Needs /usr/lib/libsocket.a file. 
-amix:
-       $(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" \
-       "CFLAGS =" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lm"
-
 beos-r4:
        $(MAKE) -f Makefile.BeOS-R4 targets \
        "GL_LIB = libGL.so" \
@@ -113,33 +69,8 @@ beos-r4:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = g++" \
        "CFLAGS = -O -DNO_CONST" \
-       "MAKELIB = ../bin/mklib.beos-r4" \
        "APP_LIB_DEPS = "
 
-bsdos:
-       $(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" \
-       "CFLAGS = -I/usr/X11/include -O2" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm"
-
-bsdos4:
-       $(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" \
-       "CFLAGS = -I/usr/X11/include -O2 -fPIC" \
-       "MAKELIB = ../bin/mklib.bsdos4" \
-       "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm"
-
 cygnus:
        $(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -148,17 +79,19 @@ cygnus:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "DLLTOOL = dlltool" \
        "WING_DIR= /wing" \
        "LD = ld" \
        "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
                -O2 -funroll-loops \
-               -fexpensive-optimizations -fomit-frame-pointer -ffast-math \
-               -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32"
+               -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
+       "CXXFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
+               -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:
        $(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \
@@ -173,24 +106,29 @@ cygnus-linux:
        "WING_DIR= /dos/wing" \
        "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
                -O2 -funroll-loops \
-               -fexpensive-optimizations -fomit-frame-pointer -ffast-math \
-               -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "MAKELIB = ../bin/mklib.cygnus-linux" \
-       "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32"
+               -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
+       "MAKELIB = $(TOP)/bin/mklib.cygnus-linux" \
+       "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
-dgux:
+darwin:
        $(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 = -O" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lm"
+       "GL_LIB = libGL.dylib" \
+       "GLU_LIB = libGLU.dylib" \
+       "GLUT_LIB = libglut.dylib" \
+       "GLW_LIB = libGLw.dylib" \
+       "OSMESA_LIB = libOSMesa.dylib" \
+       "CC = cc" \
+       "CXX = cc" \
+       "CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \
+                -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+                -dynamic -Ddarwin" \
+       "CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \
+                -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+                -dynamic -Ddarwin" \
+       "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" 
 
 freebsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -200,10 +138,10 @@ freebsd:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.freebsd" \
+       "CXXFLAGS = -O2 -fPIC -pedantic" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 freebsd-386:
@@ -214,31 +152,37 @@ freebsd-386:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.freebsd" \
+       "CXXFLAGS = -O3 -ffast-math -fPIC -pedantic -DFREEBSD" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
-gcc:
+gcc-sl:
        $(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" \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CPLUSPLUS = g++" \
-       "CFLAGS = -pedantic -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "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"
+gcc-mesa-sl:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 libmesa \
+       "MESA_LIB = libMesa.so" \
+       "CC = gcc" \
+       "CFLAGS = -fPIC -O3" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \
+
 hpux9:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -248,7 +192,7 @@ hpux9:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-gcc:
@@ -259,10 +203,11 @@ hpux9-gcc:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "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:
@@ -274,7 +219,6 @@ hpux9-sl:
        "OSMESA_LIB = libOSMesa.sl" \
        "CC = cc" \
        "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.hpux" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-gcc-sl:
@@ -285,12 +229,13 @@ hpux9-gcc-sl:
        "GLW_LIB = libGLw.sl" \
        "OSMESA_LIB = libOSMesa.sl" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.hpux" \
+       "CXXFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
+# The hpux10 configs should work for hpux11 as well.
 hpux10:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -299,20 +244,23 @@ hpux10:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
+       "CXX = aCC" \
        "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+       "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:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL" \
        "GLU_LIB = libGLU" \
        "GLUT_LIB = libglut" \
-       "GLW_LIB = libGLw.a" \
-       "OSMESA_LIB = libOSMesa.a" \
+       "GLW_LIB = libGLw" \
+       "OSMESA_LIB = libOSMesa" \
        "CC = cc" \
-       "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.hpux" \
+       "CXX = aCC" \
+       "CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-gcc:
@@ -323,10 +271,11 @@ hpux10-gcc:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "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:
@@ -337,118 +286,76 @@ hpux10-gcc-sl:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.hpux" \
+       "CXXFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 
-# For IRIX 4: don't use -fullwarn because it causes too much garbage
-irix4:
-       pmake $(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" \
-       "CFLAGS = -O2 -ansi -prototypes -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lXext -lXmu -lXi -lX11 -lm"
-
-# On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it
-irix5:
-       pmake $(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" \
-       "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
-
-# On IRIX 5.2+gcc
-irix5-gcc:
-       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 = -O2 -pedantic -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
-
-# IRIX 5 using Dynamic Shared Objects (DSO)
-irix5-dso:
-       pmake $(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 = cc" \
-       "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
-       "MAKELIB = ../bin/mklib.irix5" \
-       "APP_LIB_DEPS = -rpath ../lib -lX11 -lXmu -lXi -lm"
-
+# IRIX 6 32-bit Targets
+#      Turn Warnings off for these errors (MIPSpro Compiler 7.30)
+#      1521:   A nonstandard preprocessing directive is used.
+#      1552:   The variable "" is set but never used.
+#      C++
+#      3262:   The variable "" was declared but never referenced.
+#      3666:   The variable "" is set but never used.
+#      Use -v if using pmake to compile files in subdirectories.
 irix6-o32:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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" \
-       "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+       "CXX = CC" \
+       "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
+       "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+       "APP_LIB_DEPS = -32 -glut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-o32-dso:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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)/lib32" \
        "CC = cc" \
-       "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
-       "MAKELIB = ../bin/mklib.irix6-32" \
-       "APP_LIB_DEPS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm"
+       "CXX = CC" \
+       "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
+       "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+       "APP_LIB_DEPS = -32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
-# For IRIX 6: -woff:
-#   1209 - controlling expression is constant
 irix6-n32:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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 = ../lib32" \
+       "LIBDIR = $(TOP)/lib32" \
        "CC = cc" \
-       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+       "CXX = CC" \
+       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+       "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \
+       "APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32-dso:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
-       "GLW_LIB = libGLw.a" \
-       "OSMESA_LIB = libOSMesa.a" \
-       "LIBDIR = ../lib32" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "LIBDIR = $(TOP)/lib32" \
        "CC = cc" \
-       "CFLAGS = -n32 -mips3 -O3 -ansi -DUSE_XSHM -woff 1185,1521" \
-       "MAKELIB = ../bin/mklib.irix6-n32" \
-       "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm"
+       "CXX = CC" \
+       "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+       "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \
+       "APP_LIB_DEPS = -n32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lfpe -lm"
 
 irix6-gcc-n32-sl:
        make $(MFLAGS) -f Makefile.X11 targets \
@@ -457,13 +364,13 @@ irix6-gcc-n32-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
-       "LIBDIR = ../lib32" \
+       "LIBDIR = $(TOP)/lib32" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.irix6-n32" \
-       "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lm"
+       "CXXFLAGS = -mabi=n32 -mips3 -O3" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "APP_LIB_DEPS = -rpath $(TOP)/lib32 -lX11 -lXmu -lXi -lm"
 
 # For IRIX 6-64: -woff:
 #   1068 - integer conversion resulted in a change of sign
@@ -474,30 +381,32 @@ irix6-gcc-n32-sl:
 #   1474 - declaring a void parameter list with a typedef is nonstandard
 #   1552 - variable was set but never used
 irix6-64:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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 = ../lib64" \
+       "LIBDIR = $(TOP)/lib64" \
        "CC = cc" \
+       "CXX = CC" \
        "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
+       "CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+       "APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-64-dso:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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 = ../lib64" \
+       "LIBDIR = $(TOP)/lib64" \
        "CC = cc" \
        "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.irix6-64" \
-       "APP_LIB_DEPS = -rpath ../lib64 -lX11 -lXmu -lXi -lm"
+       "CXX = CC" \
+       "CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+       "APP_LIB_DEPS = -64 -rpath $(TOP)/lib64 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lm"
 
 linux:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -507,30 +416,17 @@ linux:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "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 = -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"
-
-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" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -funroll-loops -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" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -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" \
 
-linux-trace:
+linux-x86:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -538,73 +434,50 @@ linux-trace:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DMESA_TRACE -I/usr/X11R6/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "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"
+       "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" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -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:
+linux-x86-sse:
        $(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 -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -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_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -mcpu=pentium4 -mfpmath=sse -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 = -mcpu=pentium4 -mfpmath=sse -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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" \
+       "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" \
-       "GEN_SOURCES = X86/matypes.h" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"
-
-linux-x86-static:
+       "ASM_SOURCES = $(X86_SOURCES)"
+
+linux-icc:
        $(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 -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -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_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "CC = icc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -tpp6 -axK -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" \
        "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" \
+       "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" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 # Contributed by Uwe_Maurer@t-online.de
 linux-ggi:
@@ -615,14 +488,17 @@ linux-ggi:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc"  \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ggi" \
-       "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm"
+       "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 -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"
 
 # Contributed by Emmanuel marty core@ggi-project.org
-linux-386-ggi:
+linux-x86-ggi:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -630,16 +506,15 @@ linux-386-ggi:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc"  \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ggi" \
-       "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S"
+       "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 -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" \
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -649,80 +524,14 @@ linux-glide:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x" \
-       "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 = -lglut -lGLU -lGL"
-
-linux-386-glide:
-       $(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" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -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 = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S"
-
-linux-386-opt-glide:
-       $(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" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -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 = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S"
-
-linux-386-opt-V2-glide:
-       $(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" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -DPTHREAD -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -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 = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S"
+       "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide3x" \
+       "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 = -L/usr/local/glide/lib -lglide3x -lglut -lGLU -lGL"
 
 linux-x86-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -731,28 +540,17 @@ linux-x86-glide:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
-       "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -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 = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_raw2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_raw3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_raw4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               FX/X86/fx_3dnow_fastpath.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+       "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide3x -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-alpha:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -762,14 +560,15 @@ linux-alpha:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \
+       "CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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"
+       "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"
 
 linux-alpha-static:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -779,10 +578,11 @@ linux-alpha-static:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "CXX = g++" \
+       "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:
@@ -793,14 +593,15 @@ linux-ppc:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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"
+       "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"
 
 linux-ppc-static:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -810,27 +611,31 @@ linux-ppc-static:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "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-static:
+linux-sparc:
        $(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" \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -pedantic -funroll-loops -O3 -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lXmu -lXi -lm"
+       "CXX = g++" \
+       "CFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "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"
 
-# Replace -mv8 with -mcypress, -msupersparc or -msparclite as appropriate.
 linux-sparc5:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -839,14 +644,15 @@ linux-sparc5:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CXXFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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"
+       "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"
 
 # 32-bit Sparc ELF userland, on UltraSparc
 linux-sparc-ultra:
@@ -857,19 +663,73 @@ linux-sparc-ultra:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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"
+       "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"
+
+# 16-bit/channel Mesa using OSMesa driver
+linux-osmesa16:
+       $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \
+       "OSMESA16_LIB = libOSMesa16.so" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
+       "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" \
+       "APP_LIB_DEPS = -lOSMesa16 -lGL"
+
+linux-osmesa16-static:
+       $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \
+       "OSMESA16_LIB = libOSMesa16.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
+       "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"
+
+# 32-bit/channel Mesa using OSMesa driver
+linux-osmesa32:
+       $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \
+       "OSMESA16_LIB = libOSMesa32.so" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
+       "CXXFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -lm -lpthread" \
+       "APP_LIB_DEPS = -lOSMesa32 -lGL"
+
+# standalone Mesa -- embedded
+# change -g to -O3 for non-debug
+linux-solo:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "SOLO = true" \
+       "LIBMESA = mesa.a" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "CXXFLAGS = -g -std=c99 -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 -lexpat" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm  -Wl,-rpath,$(TOP)/lib" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm  -Wl,-rpath,$(TOP)/lib" \
+       "APP_LIB_DEPS = -L$(TOP)/lib -lglut -lGLU -lGL -lm  -lpthread -Wl,-rpath,$(TOP)/lib" 
 
 # May want to add these CFLAGS for better performance under LynxOS and GCC:
 # -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops
 # -fexpensive-optimizations -fomit-frame-pointer -ffast-math
-# and  -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium
 lynxos:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -878,40 +738,12 @@ lynxos:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "CXXFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm"
 
-machten-2.2:
-       $(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 = -DTENON -D__MACHTEN__ -fstrength-reduce -m68881 -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -L/usr/lib/X11 -lX11 -lm"
-
-machten-4.0:
-       $(MAKE) 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 = -DTENON -D__MACHTEN__ -fstrength-reduce -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -L/usr/X11R5/lib -lX11 -lm"
-
 mklinux:
        $(MAKE) targets \
        "GL_LIB = libGL.a" \
@@ -920,10 +752,11 @@ mklinux:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -pedantic -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "CXXFLAGS = -pedantic -O2" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
 
 netbsd:
@@ -934,21 +767,12 @@ netbsd:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.netbsd" \
+       "CXXFLAGS = -O2 -fPIC"  \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
-next:  
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "DRIVER_SOURCES = OSmesa/osmesa.c" \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "CC = ${MYCC}" \
-       "CFLAGS = -traditional-cpp -DOPENSTEP -O4" \
-       "MAKELIB = ../bin/mklib.ar-ruv"
-
 openbsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -958,7 +782,9 @@ openbsd:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = cc" \
        "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
-       "MAKELIB = ../bin/mklib.openbsd" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -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"
 
 openstep:      
@@ -969,7 +795,7 @@ openstep:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = ${MYCC}" \
        "CFLAGS = -traditional-cpp -DOPENSTEP -O4" \
-       "MAKELIB = ../bin/mklib.openstep"
+       "MAKELIB = $(TOP)/bin/mklib.openstep"
 
 openstep-win32:        
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -978,43 +804,13 @@ openstep-win32:
        "GLU_LIB = libGLU.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -DOPENSTEP -O4" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.openstep"
-
-os2-x11:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB   = MesaGL.a" \
-       "GLU_LIB  = MesaGLU.a" \
-       "GLUT_LIB = glut.a" \
-       "GLW_LIB = GLw.a" \
-       "OSMESA_LIB = OSMesa.a" \
-       "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -Zmt -O3 -m486 -funroll-loops -Wall -Wno-unused -ansi -pedantic -ffast-math -DUSE_X86_ASM -D_SVID_SOURCE -D_BSD_SOURCE -I$(X11ROOT)/XFree86/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ..\\bin\\mklib-emx.cmd " \
-       "APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S"
+       "CXXFLAGS = -DOPENSTEP -O4" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "MAKELIB = $(TOP)/bin/mklib.openstep"
 
 osf1:
-       $(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" \
-       "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
-
-osf1-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -1023,37 +819,11 @@ osf1-sl:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = cc" \
        "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.osf1" \
+       "GL_LIB_DEPS = -lX11 -lXext -lm -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"
 
-pgi-cygnus:
-       $(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 = pgcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fast -cyglibs -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lm"
-
-pgi-mingw32:
-       $(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 = pgcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fast -msvcrt -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lm"
-
 # QNX V4 & Watcom Compiler
 qnx:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1064,37 +834,9 @@ qnx:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O" \
-       "MAKELIB = ../bin/mklib.qnx" \
-       "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
-
-sco:
-       $(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 = -pedantic -O2 -mieee-fp" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "MAKELIB = $(TOP)/bin/mklib.qnx" \
        "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
 
-sco5:
-       $(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 = -pedantic -O2 -mieee-fp" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm"
-
 solaris-x86:
        $(MAKE) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -1104,7 +846,6 @@ solaris-x86:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.solaris" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 solaris-x86-gcc:
@@ -1115,10 +856,10 @@ solaris-x86-gcc:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.solaris" \
+       "CXXFLAGS = -O3 -m486 -fPIC" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4:
@@ -1130,7 +871,7 @@ sunos4:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = acc" \
        "CFLAGS = -O -DUSE_XSHM -DSUNOS4" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-sl:
@@ -1153,10 +894,11 @@ sunos4-gcc:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "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:
@@ -1167,10 +909,11 @@ sunos4-gcc-sl:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.sunos4" \
+       "CXX = g++" \
+       "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:
@@ -1181,25 +924,14 @@ sunos4-gcc-x11r6-sl:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.sunos4" \
+       "CXX = g++" \
+       "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:
-       $(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" \
-       "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-sunos5-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -1207,23 +939,17 @@ sunos5-sl:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = cc" \
-       "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "MAKELIB = ../bin/mklib.sunos5" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-sunos5-ultra:
-       $(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" \
-       "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-sunos5-ultra-sl:
+       "CXX = c++" \
+       "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM" \
+       "CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include" \
+       "GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm" \
+       "GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lCrun -lX11 -lglut -lGLU -lGL -lm"
+
+sunos5-smp:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -1231,25 +957,17 @@ sunos5-ultra-sl:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = cc" \
-       "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "MAKELIB = ../bin/mklib.sunos5" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+       "CXX = c++" \
+       "CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include" \
+       "GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
+       "GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm -lCrun"
 
 sunos5-gcc:
-       $(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 = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-sunos5-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
@@ -1257,99 +975,15 @@ sunos5-gcc-sl:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.sunos5" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-sunos5-x11r6-gcc-sl:
-       $(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" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -fPIC -O3 -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.sunos5" \
-       "APP_LIB_DEPS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm"
-
-# Contributed by John Stone
-sunos5-pthread:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "CC = cc" \
-       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
-
-# Contributed by John Stone
-sunos5-thread:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "CC = cc" \
-       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DSOLARIS_THREADS" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
-
-# Contributed by John Stone
-sunos5-gcc-thread:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DSOLARIS_THREADS" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
-
-# Contributed by John Stone
-sunos5-gcc-pthread:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DPTHREADS" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
-
-# from Ron Metoyer (metoyer@iexist.flw.lucent.com)
-sunSolaris-CC:
-       $(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" \
-       "CFLAGS = -O -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
-
-#This config doesn't work, Ultrix C compiler isn't ANSI compliant
-ultrix:
-       $(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" \
-       "CFLAGS = -O -Dconst=/**/" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
+       "CXX = g++" \
+       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM" \
+       "CXXFLAGS = -O3 -I/usr/openwin/include" \
+       "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" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm"
 
 ultrix-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1359,25 +993,13 @@ ultrix-gcc:
        "GLW_LIB = libGLw.a" \
        "OSMESA_LIB = libOSMesa.a" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -pedantic -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "CXXFLAGS = -pedantic -O2" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
 
-# tested on Cray C90 running UNICOS 8.0.4
-unicos:
-       $(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" \
-       "CFLAGS =" \
-       "MAKELIB = ../bin/mklib/ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
-
 unixware:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -1387,7 +1009,8 @@ unixware:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "CXXFLAGS = -O" \
+       "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
 unixware-shared:
@@ -1399,36 +1022,9 @@ unixware-shared:
        "OSMESA_LIB = libOSMesa" \
        "CC = cc" \
        "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \
-       "MAKELIB = ../bin/mklib.solaris" \
+       "CXXFLAGS = -O -KPIC,inline" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
-uwin:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -pedantic -O2 -I/usr/X11/include " \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
-
-vistra:
-       $(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 = -pedantic -O2" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lgen -lm"
-
-
 # for debugging on IRIX 5.x systems
 # -woff 1209 = "controlling expression is constant"
 # -woff 1210 = "controlling expression is constant"
@@ -1436,29 +1032,16 @@ vistra:
 # -woff 1521 = "nonstandard preprocessing directive is used"
 # -woff 3496 = "bitwise operator precedence"
 irix-debug:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(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 = ../lib32" \
+       "LIBDIR = $(TOP)/lib32" \
        "CC = cc" \
        "CFLAGS = -g -n32 -ansi -fullwarn -DUSE_XSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
-
-DEBUG:
-       pmake $(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" \
-       "CFLAGS = -g -ansi -prototypes -fullwarn -DUSE_XSHM -DDEBUG" \
-       "MAKELIB = ../bin/mklib.ar-rcv" \
-       "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lfpe -lm"
+       "APP_LIB_DEPS = -rpath $(TOP)/lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
 
 # for debugging on Linux systems
 linux-debug:
@@ -1469,29 +1052,16 @@ linux-debug:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DSVGA -I/usr/include/glide -DFX -DMESA_TRACE" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CXX = g++" \
+       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG" \
+       "CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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" \
+       "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"
 
-linux-static-debug:
-       $(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 = -g -ansi -pedantic -Wall -Wmissing-prototypes -DUSE_XSHM -DDEBUG -DMESA_DEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/include/glide -I/usr/local/glide/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm" \
-
 linux-x86-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -1499,27 +1069,16 @@ linux-x86-debug:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
-       "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -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_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
-       "MAKELIB = ../bin/mklib.linux" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -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 -DDEBUG -DMESA_DEBUG" \
+       "CXXFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG" \
+       "GLUT_CFLAGS = -fexceptions" \
        "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" \
+       "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" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-glide-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1529,67 +1088,9 @@ linux-glide-debug:
        "GLW_LIB = libGLw.so" \
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
-       "CPLUSPLUS = g++" \
+       "CXX = g++" \
        "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread"
+       "CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide3x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread"
 
-# for profiling on Linux systems
-linux-prof:
-       $(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 = -Wall -O2 -pg -ansi -pedantic -ffast-math -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               FX/X86/fx_3dnow_fastpath.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"
-
-linux-glide-prof:
-       $(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 = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -I/usr/include/glide -I/usr/local/glide/include" \
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
-       "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
-               X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
-               X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
-               X86/x86_xform_raw4.S X86/x86_xform_masked4.S \
-               X86/x86_cliptest.S X86/x86_vertex.S \
-               X86/mmx_blend.S \
-               X86/3dnow_xform_raw2.S X86/3dnow_xform_masked2.S \
-               X86/3dnow_xform_raw3.S X86/3dnow_xform_masked3.S \
-               X86/3dnow_xform_raw4.S X86/3dnow_xform_masked4.S \
-               X86/3dnow_norm_raw.S X86/3dnow_vertex.S \
-               FX/X86/fx_3dnow_fastpath.S \
-               X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
-               X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
-               X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
-               X86/katmai_norm_raw.S X86/katmai_vertex.S"