Merge remote branch 'origin/master' into pipe-video

[mesa.git] / configs / beos

diff --git a/configs/beos b/configs/beos
index 9974b7b220194798385d4d08c7a78bb339c7c6f2..ac8d6fc6f2169097774c9f8d63057d91e7cff9c2 100644 (file)
--- a/configs/beos
+++ b/configs/beos
@@ -26,8 +26,8 @@ ifeq ($(CPU), x86)
                -DUSE_3DNOW_ASM \
                -DUSE_SSE_ASM
        
-       ASM_SOURCES = $(X86_SOURCES)
-       ASM_API = $(X86_API)
+       MESA_ASM_SOURCES = $(X86_SOURCES)
+       GLAPI_ASM_SOURCES = $(X86_API)
 
        CC = gcc
        CXX = g++
@@ -90,10 +90,9 @@ else
 endif
 
 # Directories
-SRC_DIRS = mesa glu glut/beos
+SRC_DIRS = gallium mesa glu glut/beos
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
-PROGRAM_DIRS = beos samples redbook demos tests
 
 # Library/program dependencies
 GL_LIB_DEPS =