st/vega: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am
index 5c5d071d10527bc20136c33253ab96c6348a2be6..8b3d6010623584e08cc5a9958296cbf1e33bdf74 100644 (file)
--- a/src/gallium/state_trackers/vega/Makefile.am
+++ b/src/gallium/state_trackers/vega/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = $(GALLIUM_CFLAGS)
@@ -29,36 +30,7 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libvega.la
 
-libvega_la_SOURCES =   \
-       api.c           \
-       api_context.c   \
-       api_filters.c   \
-       api_images.c    \
-       api_masks.c     \
-       api_misc.c      \
-       api_paint.c     \
-       api_params.c    \
-       api_path.c      \
-       api_text.c      \
-       api_transform.c \
-       arc.c           \
-       bezier.c        \
-       handle.c        \
-       image.c         \
-       mask.c          \
-       paint.c         \
-       path.c          \
-       polygon.c       \
-       renderer.c      \
-       shader.c        \
-       shaders_cache.c \
-       stroker.c       \
-       text.c          \
-       vg_context.c    \
-       vg_manager.c    \
-       vg_state.c      \
-       vg_translate.c  \
-       vgu.c
+libvega_la_SOURCES = $(C_SOURCES)
 
 BUILT_SOURCES = api_tmp.h
 CLEANFILES = api_tmp.h

diff --git a/src/gallium/state_trackers/vega/Makefile.sources b/src/gallium/state_trackers/vega/Makefile.sources
new file mode 100644 (file)
index 0000000..cba9722
--- /dev/null
+++ b/src/gallium/state_trackers/vega/Makefile.sources
@@ -0,0 +1,30 @@
+C_SOURCES :=   \
+       api.c \
+       api_context.c \
+       api_filters.c \
+       api_images.c \
+       api_masks.c \
+       api_misc.c \
+       api_paint.c \
+       api_params.c \
+       api_path.c \
+       api_text.c \
+       api_transform.c \
+       arc.c \
+       bezier.c \
+       handle.c \
+       image.c \
+       mask.c \
+       paint.c \
+       path.c \
+       polygon.c \
+       renderer.c \
+       shader.c \
+       shaders_cache.c \
+       stroker.c \
+       text.c \
+       vg_context.c \
+       vg_manager.c \
+       vg_state.c \
+       vg_translate.c \
+       vgu.c

diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index f8d7504025539105483a476328fc9b28787e5dc2..29d5498c6c47eaef172ef60e0704cda610a7b416 100644 (file)
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -15,38 +15,6 @@ env.Append(CPPDEFINES = [
     'KHRONOS_DLL_EXPORTS',
 ])
 
-vega_sources = [
-    'api.c',
-    'api_context.c',
-    'api_filters.c',
-    'api_images.c',
-    'api_masks.c',
-    'api_misc.c',
-    'api_paint.c',
-    'api_params.c',
-    'api_path.c',
-    'api_text.c',
-    'api_transform.c',
-    'arc.c',
-    'bezier.c',
-    'handle.c',
-    'image.c',
-    'mask.c',
-    'paint.c',
-    'path.c',
-    'polygon.c',
-    'renderer.c',
-    'shader.c',
-    'shaders_cache.c',
-    'stroker.c',
-    'text.c',
-    'vg_context.c',
-    'vg_manager.c',
-    'vg_state.c',
-    'vg_translate.c',
-    'vgu.c'
-]
-
 api_tmp, = env.CodeGenerate(
         target = 'api_tmp.h',
         script = '#src/mapi/mapi_abi.py',
@@ -56,7 +24,7 @@ api_tmp, = env.CodeGenerate(
 
 st_vega = env.ConvenienceLibrary(
     target = 'st_vega',
-    source = vega_sources,
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 )
 
 Export('st_vega')