Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / dri / r600 / Makefile

diff --git a/src/mesa/drivers/dri/r600/Makefile b/src/mesa/drivers/dri/r600/Makefile
index 5bdc1afbf07edee8736522759f8e4f7e41074f89..9b7c42042e66c0bb026b50ff93e01792ca81e4ea 100644 (file)
--- a/src/mesa/drivers/dri/r600/Makefile
+++ b/src/mesa/drivers/dri/r600/Makefile
@@ -27,16 +27,19 @@ COMMON_SOURCES = \
        ../common/dri_util.c
 
 RADEON_COMMON_SOURCES = \
-       radeon_texture.c \
+       radeon_bo_legacy.c \
        radeon_common_context.c \
+       radeon_buffer_objects.c \
        radeon_common.c \
+       radeon_cs_legacy.c \
        radeon_dma.c \
+       radeon_debug.c \
+       radeon_fbo.c \
        radeon_lock.c \
-       radeon_bo_legacy.c \
-       radeon_cs_legacy.c \
        radeon_mipmap_tree.c \
        radeon_span.c \
-       radeon_fbo.c
+       radeon_texture.c \
+       radeon_queryobj.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
@@ -63,8 +66,7 @@ DRIVER_SOURCES = \
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-DRIVER_DEFINES = -DCOMPILE_R600 -DR200_MERGED=0 \
-       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R600 \
+DRIVER_DEFINES = -DRADEON_R600 \
 #      -DRADEON_BO_TRACK \
        -Wall
 
@@ -74,4 +76,3 @@ DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 include ../Makefile.template
 
-symlinks: