auxiliary/vl: split the vl sources list into VL_SOURCES

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.

v2: Rebase.

Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 8046943c1a83b7a3d01b2cea3bee467433a195d3..2e7d7a8c701f16f103888b269da615ef0a16bee8 100644 (file)
--- 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 bea9c5508100a76de9f5f72e6c4067f3425a0093..8010d9b2ae4dad098bb0a3882edb1ffcf564139f 100644 (file)
--- 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 38c39b60a3a83032d321f92a6fac9227bfe952c7..eefb013630fd6cb461a1c6cd0040b460563984c4 100644 (file)
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -303,7 +303,9 @@ C_SOURCES := \
        util/u_upload_mgr.h \
        util/u_vbuf.c \
        util/u_vbuf.h \
-       util/u_video.h \
+       util/u_video.h
+
+VL_SOURCES := \
        vl/vl_compositor.c \
        vl/vl_compositor.h \
        vl/vl_csc.c \

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 6f67849d802bda1f1730afc8f88b4136f725ca9d..0acd3c7d2851fd3ff88355ebcedfcd03c6dec74d 100644 (file)
--- 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'
 ])