Mesa (master): auxiliary/vl: split the vl sources list into VL_SOURCES
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Nov 26 20:13:35 UTC 2014
Module: Mesa
Branch: master
Commit: 86a51eb86177971d9a0c0f0028cc143b13486a07
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=86a51eb86177971d9a0c0f0028cc143b13486a07
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Nov 9 04:44:16 2014 +0000
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 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 | 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 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 bea9c55..8010d9b 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 38c39b6..eefb013 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 6f67849..0acd3c7 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'
])
More information about the mesa-commit
mailing list