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 f223b2d922882d1b6860d3bcad310b76231d12e4..19df62742ecc8e6ff1a7c99f4d83e0ba6574105d 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -4,34 +4,57 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+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_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_mipmap_tree.c \
+       radeon_pixel_read.c \
+       radeon_queryobj.c \
+       radeon_span.c \
+       radeon_texture.c \
+       radeon_tex_copy.c \
+       radeon_tex_getimage.c \
+       radeon_tile.c
 
 DRIVER_SOURCES = \
        radeon_context.c \
        radeon_ioctl.c \
-       radeon_lock.c \
        radeon_screen.c \
        radeon_state.c \
        radeon_state_init.c \
        radeon_tex.c \
-       radeon_texmem.c \
        radeon_texstate.c \
        radeon_tcl.c \
        radeon_swtcl.c \
-       radeon_span.c \
        radeon_maos.c \
-       radeon_sanity.c 
+       radeon_sanity.c \
+       radeon_blit.c \
+       $(RADEON_COMMON_SOURCES)
 
 C_SOURCES = \
        $(COMMON_SOURCES) \
-       $(DRIVER_SOURCES) 
+       $(DRIVER_SOURCES) \
+       $(CS_SOURCES)
+
+DRIVER_DEFINES = -DRADEON_R100
 
-DRIVER_DEFINES = -DRADEON_COMMON=0
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 X86_SOURCES = 
 
 include ../Makefile.template
 
-symlinks: