-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
-
-# ffb, gamma, and sis are missing because they have
-# not be converted to use the new interface. Do i810 & i830 really
-# need to be included here?
+EXTRA_LIB_PATH=-L/usr/X11R6/lib64
+
+# sis is missing because it has not been converted to use
+# the new interface. i810 are missing because there is no x86-64
+# system where they could *ever* be used.