radeon: Insist on libdrm being present to build.

[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 ae2e695bfcc0a0fb21731be59eb4841906427972..1aaa17cf3d74d3ad203970510c493e7a5e1be83b 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -4,29 +4,28 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
-CFLAGS += $(RADEON_CFLAGS)
-
 LIBNAME = radeon_dri.so
 
-MINIGLX_SOURCES = server/radeon_dri.c 
+include ../Makefile.defines
 
-ifeq ($(RADEON_LDFLAGS),)
-CS_SOURCES = radeon_cs_space_drm.c
+ifeq ($(RADEON_LIBS),)
+CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
 endif
 
 RADEON_COMMON_SOURCES = \
-       radeon_bo_legacy.c \
+       radeon_buffer_objects.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_texture.c \
+       radeon_tex_copy.c \
+       radeon_tile.c
 
 DRIVER_SOURCES = \
        radeon_context.c \
@@ -40,6 +39,7 @@ DRIVER_SOURCES = \
        radeon_swtcl.c \
        radeon_maos.c \
        radeon_sanity.c \
+       radeon_blit.c \
        $(RADEON_COMMON_SOURCES)
 
 C_SOURCES = \
@@ -47,11 +47,12 @@ C_SOURCES = \
        $(DRIVER_SOURCES) \
        $(CS_SOURCES)
 
-DRIVER_DEFINES = -DRADEON_R100 -Wall
+DRIVER_DEFINES = -DRADEON_R100
 
-DRI_LIB_DEPS += $(RADEON_LDFLAGS)
+INCLUDES += $(RADEON_CFLAGS)
+DRI_LIB_DEPS += $(RADEON_LIBS)
 
 X86_SOURCES = 
 
-include ../Makefile.template
+include ../Makefile.targets