r300: fix regression introduced by da73c1ed

[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 77b3d168f342854b3721dcb8918b984faf54b8c5..409d126ab2b4da48b8b1983f7221979efefea911 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -27,57 +27,55 @@ 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_buffer_objects.c
+       radeon_queryobj.c \
+       radeon_texture.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
+                r300_blit.c \
                 r300_context.c \
                 r300_draw.c \
-                r300_ioctl.c \
                 r300_cmdbuf.c \
                 r300_state.c \
                 r300_render.c \
                 r300_tex.c \
+                r300_texcopy.c \
                 r300_texstate.c \
                 r300_vertprog.c \
                 r300_fragprog_common.c \
                 r300_shader.c \
+                radeon_mesa_to_rc.c \
                 r300_emit.c \
                 r300_swtcl.c \
-                r300_queryobj.c \
                 $(RADEON_COMMON_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
 
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
-PIPE_DRIVERS =  compiler/libr300compiler.a
+SUBDIRS = compiler
 
-##### TARGETS #####
+EXTRA_MODULES = compiler/libr300compiler.a
 
-include ../Makefile.template
 
-symlinks:
+##### TARGETS #####
 
-# Mark the archive phony so that we always check for recompilation
-.PHONY : compiler/libr300compiler.a
+include ../Makefile.template
 
-compiler/libr300compiler.a:
-       cd compiler && $(MAKE)