Don't include glapi_*.S files in DRI / solo builds.

diff --git a/configs/linux-icc b/configs/linux-icc
index 9675de93de6a5c46ea289bd5295b03bde235d225..2b9d609029728e17bf4ba3a2a4c4d655900c202f 100644 (file)
--- 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 b8ebd7f4abec592d6e89504615f83a1b02e97126..e06c27f60496a49ddeb58d0a70eda213843d00c4 100644 (file)
--- 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 ac236ad460f5edf8e7b3398897fdb15bf3537ae8..5f7cda789c88ad133988ed1a1d37370903e2a180 100644 (file)
--- 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 6e4b6229acc28bc261f4dd1c104fe9e89d54474b..15c9f92968eacefe18297c531ba839f9a3eeb2db 100644 (file)
--- 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 745ffb51c3b678eccd6f79638c53e95b9f8e1cf0..a1b3027d57aae9c1eb0345887dc32f2a4b4a1784 100644 (file)
--- 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 cfe97df75fd0e757738408bdaaecf0831d634bd9..9ee404f10ebf4a919bea4789ba88849ae3dec57c 100644 (file)
--- 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