Squashed commit of the following:

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

diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index d1413319c97d8179b94376ea344b2e1df04be0b1..27287793bda9ae0837e5e48da67382ed40093e22 100644 (file)
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -4,8 +4,8 @@ include $(TOP)/configs/current
 LIBNAME = svga
 
 C_SOURCES = \
-       svgadump/st_shader_dump.c \
-       svgadump/st_shader_op.c \
+       svgadump/svga_shader_dump.c \
+       svgadump/svga_shader_op.c \
        svgadump/svga_dump.c \
        svga_cmd.c \
        svga_context.c \
@@ -27,8 +27,6 @@ C_SOURCES = \
        svga_pipe_vertex.c \
        svga_pipe_vs.c \
        svga_screen.c \
-       svga_screen_buffer.c \
-       svga_screen_texture.c \
        svga_screen_cache.c \
        svga_state.c \
        svga_state_need_swtnl.c \
@@ -45,11 +43,21 @@ C_SOURCES = \
        svga_tgsi.c \
        svga_tgsi_decl_sm20.c \
        svga_tgsi_decl_sm30.c \
-       svga_tgsi_insn.c
+       svga_tgsi_insn.c \
+       svga_sampler_view.c \
+       svga_surface.c \
+       svga_resource.c \
+       svga_resource_texture.c \
+       svga_resource_buffer.c \
+       svga_resource_buffer_upload.c 
+
 
 LIBRARY_INCLUDES = \
        -I$(TOP)/src/gallium/drivers/svga/include
 
+# With linux-debug we get a lots of warnings, filter out the bad flags.
+CFLAGS := $(filter-out -pedantic, $(filter-out -ansi, $(CFLAGS)))
+
 LIBRARY_DEFINES = \
        -std=gnu99 -fvisibility=hidden \
        -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H