Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 6a246edf7cb0ea88474c53d1bf770a82e9713f6b..776f1e3f3f77b30b044cc8b1bd20944e22a534b2 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -13,17 +13,23 @@ ifeq ($(USING_EGL), 1)
 EGL_SOURCES = server/radeon_egl.c
 endif
 
+ifeq ($(RADEON_LDFLAGS),)
+CS_SOURCES = radeon_cs_space_drm.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_queryobj.c \
        radeon_span.c \
-       radeon_fbo.c
+       radeon_texture.c
 
 
 DRIVER_SOURCES = r200_context.c \
@@ -42,47 +48,14 @@ DRIVER_SOURCES = r200_context.c \
                 r200_vertprog.c \
                 radeon_screen.c \
                 $(EGL_SOURCES) \
-                $(RADEON_COMMON_SOURCES)
+                $(RADEON_COMMON_SOURCES) \
+                $(CS_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 X86_SOURCES = 
 
-DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
-
-SYMLINKS = \
-       server/radeon_egl.c  \
-       server/radeon_dri.c  \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h
-
-COMMON_SYMLINKS = \
-       radeon_chipset.h \
-       radeon_screen.c \
-       radeon_screen.h \
-       radeon_bo_legacy.c \
-       radeon_cs_legacy.c \
-       radeon_bo_legacy.h \
-       radeon_cs_legacy.h \
-       radeon_bocs_wrapper.h \
-       radeon_span.h \
-       radeon_span.c \
-       radeon_lock.c \
-       radeon_lock.h \
-       radeon_common.c \
-       radeon_common_context.c \
-       radeon_common_context.h \
-       radeon_common.h \
-       radeon_cmdbuf.h \
-       radeon_mipmap_tree.c \
-       radeon_mipmap_tree.h \
-       radeon_texture.c \
-       radeon_texture.h \
-       radeon_dma.c \
-       radeon_dma.h \
-       radeon_fbo.c
+DRIVER_DEFINES = -DRADEON_R200 -Wall
 
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
@@ -93,15 +66,3 @@ include ../Makefile.template
 
 #INCLUDES += -I../radeon/server
 
-server:
-       mkdir -p server
-
-$(SYMLINKS): server
-       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
-
-
-$(COMMON_SYMLINKS):
-       @[ -e $@ ] || ln -sf ../radeon/$@ ./
-
-symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
-