Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/drivers/dri/r600/Makefile b/src/mesa/drivers/dri/r600/Makefile
index 667eb1f919c9ebec300ac70e54d6eeac5e3cb6d6..7d5a7b1ab6f9a3ec33cbbdbbe64387f52739f706 100644 (file)
--- a/src/mesa/drivers/dri/r600/Makefile
+++ b/src/mesa/drivers/dri/r600/Makefile
@@ -13,6 +13,10 @@ ifeq ($(USING_EGL), 1)
 EGL_SOURCES = server/radeon_egl.c
 endif
 
+ifeq ($(RADEON_LDFLAGS),)
+CS_SOURCES = radeon_cs_space_drm.c
+endif
+
 COMMON_SOURCES = \
        ../../common/driverfuncs.c \
        ../common/mm.c \
@@ -23,16 +27,19 @@ COMMON_SOURCES = \
        ../common/dri_util.c
 
 RADEON_COMMON_SOURCES = \
-       radeon_texture.c \
+       radeon_bo_legacy.c \
        radeon_common_context.c \
+       radeon_buffer_objects.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_span.c \
-       radeon_fbo.c
+       radeon_texture.c \
+       radeon_queryobj.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
@@ -50,65 +57,23 @@ DRIVER_SOURCES = \
                 r700_state.c    \
                 r700_clear.c    \
                 r700_render.c   \
-                r700_tex.c      \
+                r600_tex.c      \
+                r600_texstate.c      \
                 r700_debug.c    \
                 $(RADEON_COMMON_SOURCES) \
-                $(EGL_SOURCES)
+                $(EGL_SOURCES) \
+                $(CS_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-DRIVER_DEFINES = -DCOMPILE_R600 -DR200_MERGED=0 \
-       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R600 \
+DRIVER_DEFINES = -DRADEON_R600 \
 #      -DRADEON_BO_TRACK \
        -Wall
 
-SYMLINKS = \
-       server/radeon_dri.c \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h \
-       server/radeon_egl.c
-
-COMMON_SYMLINKS = \
-       radeon_chipset.h \
-       radeon_screen.c \
-       radeon_screen.h \
-       radeon_span.h \
-       radeon_span.c \
-       radeon_bo_legacy.c \
-       radeon_cs_legacy.c \
-       radeon_bo_legacy.h \
-       radeon_cs_legacy.h \
-       radeon_bocs_wrapper.h \
-       radeon_lock.c \
-       radeon_lock.h \
-       radeon_common.c \
-       radeon_common.h \
-       radeon_common_context.c \
-       radeon_common_context.h \
-       radeon_cmdbuf.h \
-       radeon_dma.c \
-       radeon_dma.h \
-       radeon_mipmap_tree.c \
-       radeon_mipmap_tree.h \
-       radeon_texture.c \
-       radeon_texture.h \
-       radeon_fbo.c
-
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####
 
 include ../Makefile.template
 
-server:
-       mkdir -p server
-
-$(SYMLINKS): server
-       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
-
-$(COMMON_SYMLINKS):
-       @[ -e $@ ] || ln -sf ../radeon/$@ ./
-
-symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
+symlinks: