[Mesa-dev] [PATCH 4/5] auxiliary/vl: split the vl sources list into VL_SOURCES

[Emil Velikov]

With follow up commit we'll split vl static lib from the auxiliary one,
and choose the appropriate vl (galliumvl or galliumvl_stub) for the
respective targets to link against.

Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/auxiliary/Android.mk       |  4 +++-
 src/gallium/auxiliary/Makefile.am      |  1 +
 src/gallium/auxiliary/Makefile.sources | 41 ++++++++++++++++++++++++++--------
 src/gallium/auxiliary/SConscript       |  1 +
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 8046943..2e7d7a8 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -28,7 +28,9 @@ include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(C_SOURCES)
+LOCAL_SRC_FILES := \
+	$(C_SOURCES) \
+	$(VL_SOURCES)
 
 LOCAL_C_INCLUDES := \
 	$(GALLIUM_TOP)/auxiliary/util \
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 1e268b2..1e18e6e 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -18,6 +18,7 @@ AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
 libgallium_la_SOURCES = \
 	$(C_SOURCES) \
+	$(VL_SOURCES) \
 	$(GENERATED_SOURCES)
 
 if HAVE_MESA_LLVM
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 9625ee5..66edb4d 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -144,20 +144,43 @@ C_SOURCES := \
 	util/u_transfer.c \
 	util/u_resource.c \
 	util/u_upload_mgr.c \
-	util/u_vbuf.c \
-	vl/vl_csc.c \
+	util/u_vbuf.c
+
+VL_SOURCES := \
 	vl/vl_compositor.c \
+	vl/vl_compositor.h \
+	vl/vl_csc.c \
+	vl/vl_csc.h \
+	vl/vl_decoder.c \
+	vl/vl_decoder.h \
+	vl/vl_defines.h \
+	vl/vl_deint_filter.c \
+	vl/vl_deint_filter.h \
+	vl/vl_idct.c \
+	vl/vl_idct.h \
 	vl/vl_matrix_filter.c \
+	vl/vl_matrix_filter.h \
+	vl/vl_mc.c \
+	vl/vl_mc.h \
 	vl/vl_median_filter.c \
-	vl/vl_decoder.c \
-	vl/vl_mpeg12_decoder.c \
+	vl/vl_median_filter.h \
 	vl/vl_mpeg12_bitstream.c \
+	vl/vl_mpeg12_bitstream.h \
+	vl/vl_mpeg12_decoder.c \
+	vl/vl_mpeg12_decoder.h \
+	vl/vl_rbsp.h \
+	vl/vl_types.h \
+	vl/vl_vertex_buffers.c \
+	vl/vl_vertex_buffers.h \
+	vl/vl_video_buffer.c \
+	vl/vl_video_buffer.h \
+	vl/vl_vlc.h \
 	vl/vl_zscan.c \
-        vl/vl_idct.c \
-	vl/vl_mc.c \
-        vl/vl_vertex_buffers.c \
-        vl/vl_video_buffer.c \
-	vl/vl_deint_filter.c
+	vl/vl_zscan.h
+
+# XXX: Add those to VL_SOURCES once we've split it out of libgallium
+#	vl/vl_winsys_dri.c \
+#	vl/vl_winsys.h \
 
 VL_STUB_SOURCES := \
 	vl/vl_stubs.c
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 94041d2..81c4f4c 100644
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -36,6 +36,7 @@ env.Depends('util/u_format_table.c', [
 
 source = env.ParseSourceList('Makefile.sources', [
     'C_SOURCES',
+    'VL_SOURCES',
     'GENERATED_SOURCES'
 ])
 
-- 
2.1.3