Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / Makefile

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index f5fea1f71b8f700352ebf6abf38920b2953cf5fb..869b2d486a48fd3c18cfb7336924915f110875bb 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -110,6 +110,7 @@ C_SOURCES = \
        util/u_draw_quad.c \
        util/u_format.c \
        util/u_format_other.c \
+       util/u_format_latc.c \
        util/u_format_s3tc.c \
        util/u_format_rgtc.c \
        util/u_format_srgb.c \
@@ -130,6 +131,7 @@ C_SOURCES = \
        util/u_network.c \
        util/u_math.c \
        util/u_mm.c \
+       util/u_pstipple.c \
        util/u_rect.c \
        util/u_ringbuffer.c \
        util/u_sampler.c \
@@ -159,7 +161,6 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_bitarit.c \
         gallivm/lp_bld_const.c \
         gallivm/lp_bld_conv.c \
-        gallivm/lp_bld_debug.c \
         gallivm/lp_bld_flow.c \
         gallivm/lp_bld_format_aos.c \
         gallivm/lp_bld_format_soa.c \
@@ -187,6 +188,7 @@ GALLIVM_SOURCES = \
         draw/draw_pt_fetch_shade_pipeline_llvm.c
 
 GALLIVM_CPP_SOURCES = \
+       gallivm/lp_bld_debug.cpp \
        gallivm/lp_bld_misc.cpp
 
 GENERATED_SOURCES = \