Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index bdb09624be40104cc6d247ebfdd86369fd0eac07..fe775eac99a39424d8608165c73f31c8d93ec22a 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/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_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_bo_legacy.c \
-       radeon_cs_legacy.c \
        radeon_mipmap_tree.c \
        radeon_span.c \
-       radeon_fbo.c
+       radeon_queryobj.c \
+       radeon_texture.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
@@ -44,77 +51,33 @@ DRIVER_SOURCES = \
                 r300_render.c \
                 r300_tex.c \
                 r300_texstate.c \
-                radeon_program.c \
-                radeon_program_alu.c \
-                radeon_program_pair.c \
-                radeon_nqssadce.c \
                 r300_vertprog.c \
                 r300_fragprog_common.c \
-                r300_fragprog.c \
-                r300_fragprog_swizzle.c \
-                r300_fragprog_emit.c \
-                r500_fragprog.c \
-                r500_fragprog_emit.c \
                 r300_shader.c \
                 r300_emit.c \
                 r300_swtcl.c \
                 $(RADEON_COMMON_SOURCES) \
-                $(EGL_SOURCES)
+                $(EGL_SOURCES) \
+                $(CS_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
-       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
+DRIVER_DEFINES = -DRADEON_R300
 #      -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)
 
+PIPE_DRIVERS =  compiler/libr300compiler.a
+
 ##### TARGETS #####
 
 include ../Makefile.template
 
-server:
-       mkdir -p server
-
-$(SYMLINKS): server
-       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
+symlinks:
 
-$(COMMON_SYMLINKS):
-       @[ -e $@ ] || ln -sf ../radeon/$@ ./
+# Mark the archive phony so that we always check for recompilation
+.PHONY : compiler/libr300compiler.a
 
-symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
+compiler/libr300compiler.a:
+       cd compiler && $(MAKE)