1 files changed, 74 insertions, 45 deletions
diff --git a/xc/lib/GL/glx/Imakefile b/xc/lib/GL/glx/Imakefile
index d4c4297aa..21c837814 100644
--- a/xc/lib/GL/glx/Imakefile
+++ b/xc/lib/GL/glx/Imakefile
@@ -29,56 +29,85 @@ XCOMM SUBDIRS = \
 XCOMM 	glu \
 XCOMM 	glw
 
-SRCS = \
-	dri_glapi.c \
-        clientattrib.c \
-	compsize.c \
-	eval.c \
-	g_render.c \
-	g_single.c \
-	g_vendpriv.c \
-	glxcmds.c \
-	glxext.c \
-	indirect_init.c \
-	pixel.c \
-	pixelstore.c \
-	render2.c \
-	renderpix.c \
-	single2.c \
-	singlepix.c \
-	vertarr.c \
-        xfont.c
+LinkSourceFile(glapi.c, ../../../extras/Mesa/src)
+LinkSourceFile(glapi.h, ../../../extras/Mesa/src)
+LinkSourceFile(glapinoop.c, ../../../extras/Mesa/src)
+LinkSourceFile(glapinoop.h, ../../../extras/Mesa/src)
+LinkSourceFile(glapioffsets.h, ../../../extras/Mesa/src)
+LinkSourceFile(glapitable.h, ../../../extras/Mesa/src)
+LinkSourceFile(glapitemp.h, ../../../extras/Mesa/src)
+LinkSourceFile(glthread.c, ../../../extras/Mesa/src)
+LinkSourceFile(glthread.h, ../../../extras/Mesa/src)
+LinkSourceFile(glapi_x86.S, ../../../extras/Mesa/src/X86)
+LinkSourceFile(assyntax.h, ../../../extras/Mesa/src/X86)
 
-OBJS = \
-	dri_glapi.o \
-        clientattrib.o \
-	compsize.o \
-	eval.o \
-	g_render.o \
-	g_single.o \
-	g_vendpriv.o \
-	glxcmds.o \
-	glxext.o \
-	indirect_init.o \
-	pixel.o \
-	pixelstore.o \
-	render2.o \
-	renderpix.o \
-	single2.o \
-	singlepix.o \
-	vertarr.o \
-        xfont.o
+     GLX_SRCS = \
+		clientattrib.c \
+		compsize.c \
+		dispatch.c \
+		eval.c \
+		g_render.c \
+		g_single.c \
+		g_vendpriv.c \
+		glapi.c \
+		glapinoop.c \
+		glthread.c \
+		glxcmds.c \
+		glxext.c \
+		indirect_init.c \
+		pixel.c \
+		pixelstore.c \
+		render2.c \
+		renderpix.c \
+		single2.c \
+		singlepix.c \
+		vertarr.c \
+	        xfont.c
+
+     GLX_OBJS = \
+	        clientattrib.o \
+		compsize.o \
+		dispatch.o \
+		eval.o \
+		g_render.o \
+		g_single.o \
+		g_vendpriv.o \
+		glapi.o \
+		glapinoop.o \
+		glthread.o \
+		glxcmds.o \
+		glxext.o \
+		indirect_init.o \
+		pixel.o \
+		pixelstore.o \
+		render2.o \
+		renderpix.o \
+		single2.o \
+		singlepix.o \
+		vertarr.o \
+	        xfont.o
 
 #if BuildXF86DRI
-DEFINES = GlxDefines
-DRI_INCS = -I../dri
+     GLX_DEFS = GlxDefines
+     DRI_INCS = -I../dri
+#endif
+
+#ifdef i386Architecture
+     ASM_SRCS = glapi_x86.S
+     ASM_OBJS = glapi_x86.o
+     ASM_DEFS = -DUSE_X86_ASM
 #endif
 
-INCLUDES = -I$(TOP)/include \
-	   -I$(TOP)/include/extensions \
-	   -I$(TOP)/include/GL \
-	   -I$(INCLUDESRC) \
-	   $(DRI_INCS)
+         SRCS = $(GLX_SRCS) $(ASM_SRCS)
+         OBJS = $(GLX_OBJS) $(ASM_OBJS)
+      DEFINES = $(GLX_DEFS) $(ASM_DEFS)
+
+     INCLUDES = -I$(TOP)/include \
+		-I$(TOP)/include/extensions \
+		-I$(TOP)/include/GL \
+		-I$(INCLUDESRC) \
+		-I../mesa/src \
+		$(DRI_INCS)
 
 #include <Library.tmpl>