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 ba409ba8130d45bddf699444616f8b85b6b5c19d..19df62742ecc8e6ff1a7c99f4d83e0ba6574105d 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -8,19 +8,27 @@ CFLAGS += $(RADEON_CFLAGS)
 
 LIBNAME = radeon_dri.so
 
-MINIGLX_SOURCES = server/radeon_dri.c 
+ifeq ($(RADEON_LDFLAGS),)
+CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
+endif
 
 RADEON_COMMON_SOURCES = \
-       radeon_texture.c \
+       radeon_bo_legacy.c \
        radeon_common_context.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_pixel_read.c \
+       radeon_queryobj.c \
        radeon_span.c \
-       radeon_fbo.c
+       radeon_texture.c \
+       radeon_tex_copy.c \
+       radeon_tex_getimage.c \
+       radeon_tile.c
 
 DRIVER_SOURCES = \
        radeon_context.c \
@@ -34,13 +42,15 @@ DRIVER_SOURCES = \
        radeon_swtcl.c \
        radeon_maos.c \
        radeon_sanity.c \
+       radeon_blit.c \
        $(RADEON_COMMON_SOURCES)
 
 C_SOURCES = \
        $(COMMON_SOURCES) \
-       $(DRIVER_SOURCES) 
+       $(DRIVER_SOURCES) \
+       $(CS_SOURCES)
 
-DRIVER_DEFINES = -DRADEON_COMMON=0
+DRIVER_DEFINES = -DRADEON_R100
 
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
@@ -48,4 +58,3 @@ X86_SOURCES =
 
 include ../Makefile.template
 
-symlinks: