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 7d7d700eacd2602f4e95ed53e4436bca608c763c..e40f546929df94c6124bab09c0abc7fdc855acf1 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -143,14 +143,13 @@ C_SOURCES = \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \
-       util/u_vbuf_mgr.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 \
+       util/u_vbuf_mgr.c \
+       vl/vl_bitstream_parser.c \
+       vl/vl_mpeg12_mc_renderer.c \
+       vl/vl_compositor.c \
+       vl/vl_csc.c \
+        vl/vl_idct.c \
+        vl/vl_vertex_buffers.c
 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_arit.c \
@@ -221,3 +220,4 @@ util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_forma
 
 util/u_half.c: util/u_half.py
        $(PYTHON2) util/u_half.py > $@
+# DO NOT DELETE