Squashed commit of the following:

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

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 2258a486616ab24075d101ddd60f06908ee975c8..c4d6b528b7c9cb64df2852ddf15ebd59fe758a1b 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -106,10 +106,13 @@ C_SOURCES = \
        util/u_dl.c \
        util/u_draw_quad.c \
        util/u_format.c \
+       util/u_format_other.c \
        util/u_format_s3tc.c \
        util/u_format_srgb.c \
        util/u_format_table.c \
        util/u_format_tests.c \
+       util/u_format_yuv.c \
+       util/u_format_zs.c \
        util/u_gen_mipmap.c \
        util/u_half.c \
        util/u_handle_table.c \
@@ -128,9 +131,9 @@ C_SOURCES = \
        util/u_surface.c \
        util/u_texture.c \
        util/u_tile.c \
-       util/u_timed_winsys.c \
+       util/u_transfer.c \
+       util/u_resource.c \
        util/u_upload_mgr.c \
-       util/u_simple_screen.c \
        target-helpers/wrap_screen.c
 
        # Disabling until pipe-video branch gets merged in
@@ -152,6 +155,7 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_depth.c \
         gallivm/lp_bld_flow.c \
         gallivm/lp_bld_format_soa.c \
+        gallivm/lp_bld_init.c \
         gallivm/lp_bld_interp.c \
         gallivm/lp_bld_intr.c \
         gallivm/lp_bld_logic.c \
@@ -162,10 +166,12 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_struct.c \
         gallivm/lp_bld_swizzle.c \
         gallivm/lp_bld_tgsi_soa.c \
-        gallivm/lp_bld_type.c
+        gallivm/lp_bld_type.c \
+        draw/draw_llvm.c \
+        draw/draw_pt_fetch_shade_pipeline_llvm.c \
+        draw/draw_llvm_translate.c
 
-GALLIVM_CPP_SOURCES = \
-        gallivm/lp_bld_init.cpp
+GALLIVM_CPP_SOURCES =
 
 GENERATED_SOURCES = \
        indices/u_indices_gen.c \