From 86a51eb86177971d9a0c0f0028cc143b13486a07 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 9 Nov 2014 04:44:16 +0000 Subject: [PATCH] auxiliary/vl: split the vl sources list into VL_SOURCES MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Emil Velikov --- src/gallium/auxiliary/Android.mk | 4 +++- src/gallium/auxiliary/Makefile.am | 1 + src/gallium/auxiliary/Makefile.sources | 4 +++- src/gallium/auxiliary/SConscript | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 8046943c1a8..2e7d7a8c701 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 bea9c550810..8010d9b2ae4 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 38c39b60a3a..eefb013630f 100644 --- 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 6f67849d802..0acd3c7d285 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.30.2