ARCH_FLAGS = -m64
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
+MESA_ASM_SOURCES = $(X86-64_SOURCES)
+GLAPI_ASM_SOURCES = $(X86-64_API)
ASM_FLAGS = -DUSE_X86_64_ASM
-LIB_DIR = $(TOP)/lib64
+LIB_DIR = lib64
EXTRA_LIB_PATH = -L/usr/X11R6/lib64