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 02af4d9280a69835bef04611eccc30da3a1d6e9f..bf90a704dd42a196d584a7f47978c9dee933d470 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -143,14 +143,11 @@ C_SOURCES = \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \
-       target-helpers/wrap_screen.c
-
-       # Disabling until pipe-video branch gets merged in
-       #vl/vl_bitstream_parser.c \
-       #vl/vl_mpeg12_mc_renderer.c \
-       #vl/vl_compositor.c \
-       #vl/vl_csc.c \
-       #vl/vl_shader_build.c \
+       vl/vl_bitstream_parser.c \
+       vl/vl_mpeg12_mc_renderer.c \
+       vl/vl_compositor.c \
+       vl/vl_csc.c \
+        vl/vl_idct.c
 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_arit.c \
@@ -176,6 +173,7 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_struct.c \
         gallivm/lp_bld_swizzle.c \
         gallivm/lp_bld_tgsi_aos.c \
+        gallivm/lp_bld_tgsi_info.c \
         gallivm/lp_bld_tgsi_soa.c \
         gallivm/lp_bld_type.c \
         draw/draw_llvm.c \
@@ -210,16 +208,17 @@ include ../Makefile.template
 
 
 indices/u_indices_gen.c: indices/u_indices_gen.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 util/u_format_srgb.c: util/u_format_srgb.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_format_parse.py util/u_format.csv
-       python util/u_format_table.py util/u_format.csv > $@
+       $(PYTHON2) util/u_format_table.py util/u_format.csv > $@
 
 util/u_half.c: util/u_half.py
-       python util/u_half.py > $@
+       $(PYTHON2) util/u_half.py > $@
+# DO NOT DELETE