radeon: Don't crash generating mipmaps when pixels=NULL

[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 4042005d031a2c0947edbebe7112c9e91bf61768..62715e3b50db536d3c3231910877d4215f914ead 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -3,6 +3,8 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+CFLAGS += $(RADEON_CFLAGS)
+
 LIBNAME = r300_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c
@@ -20,16 +22,20 @@ COMMON_SOURCES = \
        ../common/xmlconfig.c \
        ../common/dri_util.c
 
+RADEON_COMMON_SOURCES = \
+       radeon_texture.c \
+       radeon_common_context.c \
+       radeon_common.c \
+       radeon_dma.c \
+       radeon_lock.c \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_mipmap_tree.c \
+       radeon_span.c \
+       radeon_fbo.c
+
 DRIVER_SOURCES = \
-                radeon_bo_legacy.c \
-                radeon_cs_legacy.c \
                 radeon_screen.c \
-                common_lock.c \
-                common_misc.c \
-                radeon_context.c \
-                radeon_ioctl.c \
-                radeon_span.c \
-                radeon_state.c \
                 r300_context.c \
                 r300_ioctl.c \
                 r300_cmdbuf.c \
@@ -42,6 +48,7 @@ DRIVER_SOURCES = \
                 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 \
@@ -50,7 +57,7 @@ DRIVER_SOURCES = \
                 r300_shader.c \
                 r300_emit.c \
                 r300_swtcl.c \
-                radeon_mipmap_tree.c \
+                $(RADEON_COMMON_SOURCES) \
                 $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
@@ -74,21 +81,27 @@ COMMON_SYMLINKS = \
        radeon_screen.h \
        radeon_span.h \
        radeon_span.c \
-       radeon_buffer.h \
        radeon_bo_legacy.c \
        radeon_cs_legacy.c \
        radeon_bo_legacy.h \
        radeon_cs_legacy.h \
-       common_context.h \
-       common_lock.c \
-       common_lock.h \
-       common_misc.c \
-       common_misc.h \
-       common_cmdbuf.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_mipmap_tree.h \
+       radeon_texture.c \
+       radeon_texture.h \
+       radeon_fbo.c
 
-DRI_LIB_DEPS += -ldrm_radeon
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####