Squashed commit of the following:

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

diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile
index d7a2c8c462ca06d16cc7bd3d6daa09f7b39e948e..5a8e00f15a2c477387d9fb29dae8277f0a7568f1 100644 (file)
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -4,29 +4,29 @@ include $(TOP)/configs/current
 LIBNAME = r300
 
 C_SOURCES = \
-       r3xx_fs.c \
-       r5xx_fs.c \
+       r300_blit.c \
        r300_chipset.c \
-       r300_clear.c \
        r300_context.c \
+       r300_debug.c \
        r300_emit.c \
        r300_flush.c \
        r300_fs.c \
        r300_query.c \
        r300_render.c \
+       r300_resource.c \
        r300_screen.c \
+       r300_screen_buffer.c \
        r300_state.c \
        r300_state_derived.c \
        r300_state_invariant.c \
        r300_vs.c \
-       r300_surface.c \
        r300_texture.c \
-       r300_tgsi_to_rc.c
+       r300_tgsi_to_rc.c \
+       r300_transfer.c
 
 LIBRARY_INCLUDES = \
        -I$(TOP)/src/mesa/drivers/dri/r300/compiler \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/include
+       -I$(TOP)/src/gallium/winsys/drm/radeon/core
 
 COMPILER_ARCHIVE = $(TOP)/src/mesa/drivers/dri/r300/compiler/libr300compiler.a
 
@@ -35,7 +35,5 @@ EXTRA_OBJECTS = \
 
 include ../../Makefile.template
 
-.PHONY : $(COMPILER_ARCHIVE)
-
 $(COMPILER_ARCHIVE):
-       cd $(TOP)/src/mesa/drivers/dri/r300/compiler; make
+       $(MAKE) -C $(TOP)/src/mesa/drivers/dri/r300/compiler