Merge remote branch 'origin/7.8'

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

diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index b1efc72872f8f8ee03d352387d891a0fd64c4a64..19df62742ecc8e6ff1a7c99f4d83e0ba6574105d 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -8,10 +8,8 @@ CFLAGS += $(RADEON_CFLAGS)
 
 LIBNAME = radeon_dri.so
 
-MINIGLX_SOURCES = server/radeon_dri.c 
-
 ifeq ($(RADEON_LDFLAGS),)
-CS_SOURCES = radeon_cs_space_drm.c
+CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
 endif
 
 RADEON_COMMON_SOURCES = \
@@ -24,9 +22,13 @@ RADEON_COMMON_SOURCES = \
        radeon_fbo.c \
        radeon_lock.c \
        radeon_mipmap_tree.c \
+       radeon_pixel_read.c \
        radeon_queryobj.c \
        radeon_span.c \
-       radeon_texture.c
+       radeon_texture.c \
+       radeon_tex_copy.c \
+       radeon_tex_getimage.c \
+       radeon_tile.c
 
 DRIVER_SOURCES = \
        radeon_context.c \
@@ -40,6 +42,7 @@ DRIVER_SOURCES = \
        radeon_swtcl.c \
        radeon_maos.c \
        radeon_sanity.c \
+       radeon_blit.c \
        $(RADEON_COMMON_SOURCES)
 
 C_SOURCES = \
@@ -47,7 +50,7 @@ C_SOURCES = \
        $(DRIVER_SOURCES) \
        $(CS_SOURCES)
 
-DRIVER_DEFINES = -DRADEON_R100 -Wall
+DRIVER_DEFINES = -DRADEON_R100
 
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
@@ -55,4 +58,3 @@ X86_SOURCES =
 
 include ../Makefile.template
 
-symlinks: