diff --git a/configs/linux-icc b/configs/linux-icc
index 9675de93de6..2b9d6090297 100644
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -17,6 +17,6 @@ GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
 
-ASM_SOURCES = $(X86_SOURCES)" \
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 
diff --git a/configs/linux-icc-static b/configs/linux-icc-static
index b8ebd7f4abe..e06c27f6049 100644
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -25,6 +25,6 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 MKLIB_OPTIONS = -arch icc
 
-ASM_SOURCES = $(X86_SOURCES)" \
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 
diff --git a/configs/linux-x86 b/configs/linux-x86
index ac236ad460f..5f7cda789c8 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -15,7 +15,7 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
 GLUT_CFLAGS = -fexceptions
 
 
-ASM_SOURCES = $(X86_SOURCES)
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide
index 6e4b6229acc..15c9f92968e 100644
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -15,7 +15,7 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
 GLUT_CFLAGS = -fexceptions
 
 
-ASM_SOURCES = $(X86_SOURCES)
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
diff --git a/configs/linux-x86-static b/configs/linux-x86-static
index 745ffb51c3b..a1b3027d57a 100644
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -25,4 +25,4 @@ GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
 
-ASM_SOURCES = $(X86_SOURCES)
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/src/mesa/sources b/src/mesa/sources
index cfe97df75fd..9ee404f10eb 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -152,7 +152,6 @@ ASM_C_SOURCES =	\
 
 X86_SOURCES =			\
 	x86/common_x86_asm.S	\
-	x86/glapi_x86.S		\
 	x86/x86_xform2.S	\
 	x86/x86_xform3.S	\
 	x86/x86_xform4.S	\
@@ -170,12 +169,17 @@ X86_SOURCES =			\
 	x86/sse_normal.S \
 	tnl/t_vtx_x86_gcc.S
 
+X86_API =			\
+	x86/glapi_x86.S
+
 SPARC_SOURCES =			\
 	sparc/clip.S		\
-	sparc/glapi_sparc.S	\
 	sparc/norm.S		\
 	sparc/xform.S
 
+SPARC_API =			\
+	sparc/glapi_sparc.S
+
 COMMON_DRIVER_SOURCES =		\
 	drivers/common/driverfuncs.c