i965/vs: Implement integer quotient and remainder math operations.

[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 409d126ab2b4da48b8b1983f7221979efefea911..55c75802cef5d1e093953f86cd387aa63713f88f 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -3,29 +3,14 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
-CFLAGS += $(RADEON_CFLAGS)
-
 LIBNAME = r300_dri.so
 
-MINIGLX_SOURCES = server/radeon_dri.c
-
-ifeq ($(USING_EGL), 1)
-EGL_SOURCES = server/radeon_egl.c
-endif
+include ../Makefile.defines
 
 ifeq ($(RADEON_LDFLAGS),)
-CS_SOURCES = radeon_cs_space_drm.c
+CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c
 endif
 
-COMMON_SOURCES = \
-       ../../common/driverfuncs.c \
-       ../common/mm.c \
-       ../common/utils.c \
-       ../common/texmem.c \
-       ../common/vblank.c \
-       ../common/xmlconfig.c \
-       ../common/dri_util.c
-
 RADEON_COMMON_SOURCES = \
        radeon_bo_legacy.c \
        radeon_buffer_objects.c \
@@ -37,9 +22,12 @@ RADEON_COMMON_SOURCES = \
        radeon_fbo.c \
        radeon_lock.c \
        radeon_mipmap_tree.c \
-       radeon_span.c \
+       radeon_pixel_read.c \
        radeon_queryobj.c \
-       radeon_texture.c
+       radeon_span.c \
+       radeon_texture.c \
+       radeon_tex_copy.c \
+       radeon_tile.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
@@ -50,7 +38,6 @@ DRIVER_SOURCES = \
                 r300_state.c \
                 r300_render.c \
                 r300_tex.c \
-                r300_texcopy.c \
                 r300_texstate.c \
                 r300_vertprog.c \
                 r300_fragprog_common.c \
@@ -66,8 +53,8 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 DRIVER_DEFINES = -DRADEON_R300
 #      -DRADEON_BO_TRACK \
-       -Wall
 
+INCLUDES += $(RADEON_CFLAGS)
 DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 SUBDIRS = compiler
@@ -77,5 +64,5 @@ EXTRA_MODULES = compiler/libr300compiler.a
 
 ##### TARGETS #####
 
-include ../Makefile.template
+include ../Makefile.targets