use ASM_API variable, bug 4415

[mesa.git] / src / mesa / sources

diff --git a/src/mesa/sources b/src/mesa/sources
index 937405474dba1cafcb7d3851d407ea312ad56d52..0756dd36f7bbc1c11313694689fa9f5622a1842e 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -16,7 +16,6 @@ MAIN_SOURCES = \
        main/convolve.c \
        main/debug.c \
        main/depth.c \
-       main/dispatch.c \
        main/dlist.c \
        main/drawpix.c \
        main/enable.c \
@@ -59,6 +58,7 @@ MAIN_SOURCES = \
        main/vtxfmt.c
 
 GLAPI_SOURCES = \
+       main/dispatch.c \
        glapi/glapi.c \
        glapi/glthread.c
 
@@ -289,9 +289,8 @@ FBDEV_DRIVER_SOURCES =                      \
 
 ### All the core C sources
 
-CORE_SOURCES = \
+SOLO_SOURCES = \
        $(MAIN_SOURCES)         \
-       $(GLAPI_SOURCES)        \
        $(MATH_SOURCES)         \
        $(ARRAY_CACHE_SOURCES)  \
        $(TNL_SOURCES)          \
@@ -303,11 +302,22 @@ CORE_SOURCES = \
 
 #      $(SLANG_C_SOURCES)
 
+CORE_SOURCES = \
+       $(GLAPI_SOURCES)        \
+       $(SOLO_SOURCES)
+
 
 ### Object files
 
-#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+SOLO_OBJECTS = \
+       $(SOLO_SOURCES:.c=.o) \
+       $(ASM_SOURCES:.S=.o)
+
+GLAPI_OBJECTS = \
+       $(GLAPI_SOURCES:.c=.o) \
+       $(ASM_API:.S=.o)
+
+CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
 
 OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)