From 443d23dd56ba797cdc43ea8bfca6e4f5a7edc203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 6 Apr 2021 12:44:46 +0200
Subject: [PATCH] build: deduplicate sources

Shorten the needed sources from

 calls_sources, calls_enum_sources, calls_resources,
 wl_proto_sources, wayland_sources,

to

  calls_sources

so adding new things such as generated dbus sources doesn't have to
happen in four locations but just one.
---
 doc/meson.build   |  2 +-
 src/meson.build   | 11 ++++++++---
 tests/meson.build | 12 ++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/meson.build b/doc/meson.build
index 674b7ad..115bebb 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -12,7 +12,7 @@ if get_option('gtk_doc')
                                calls_vala_sources,
                                dependencies: calls_vala_deps)
   calls_doc_lib = library('calls-doc',
-                          [calls_sources, calls_enum_sources, wayland_sources, wl_proto_sources, gdbofono_src],
+                          [calls_sources, gdbofono_src],
                           include_directories: calls_includes,
                           link_with: calls_vala_doc_lib,
                           dependencies: calls_deps)
diff --git a/src/meson.build b/src/meson.build
index e743f1c..d6b6f3d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -75,6 +75,12 @@ calls_resources = gnome.compile_resources(
    c_name: 'call',
 )
 
+calls_generated_sources = [
+  calls_enum_sources,
+  calls_resources,
+  wl_proto_sources,
+]
+
 calls_sources = files(['calls-message-source.c', 'calls-message-source.h',
                        'calls-call.c',
                        'calls-ussd.c',
@@ -100,7 +106,7 @@ calls_sources = files(['calls-message-source.c', 'calls-message-source.h',
                        'calls-notifier.c', 'calls-notifier.h',
                        'calls-contacts-box.c', 'calls-contacts-box.h',
                        'calls-contacts-row.c', 'calls-contacts-row.h',
-                      ])
+                      ]) + wayland_sources + calls_generated_sources
 
 calls_config_data = config_data
 calls_config_data.set_quoted('VCS_TAG', '@VCS_TAG@')
@@ -119,8 +125,7 @@ config_h = vcs_tag(
 
 executable (
   'gnome-calls',
-  calls_sources, calls_enum_sources, calls_resources,
-  wl_proto_sources, wayland_sources, 'main.c',
+  calls_sources, 'main.c',
   dependencies : calls_deps,
   export_dynamic : true,
   include_directories : calls_includes,
diff --git a/tests/meson.build b/tests/meson.build
index bd8f9d3..c471ec8 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,8 +45,8 @@ foreach test : tests
                     'common.h' ]
 
   t = executable(name, test_sources,
-                 calls_sources, dummy_sources, calls_enum_sources, calls_resources,
-                 wl_proto_sources, wayland_sources,
+                 calls_sources,
+                 dummy_sources,
                  c_args : test_cflags_with_test_define,
                  link_args: test_link_args,
                  link_with : calls_vala,
@@ -62,8 +62,7 @@ endforeach
 test_sources = [ 'test-manager.c' ]
 
 t = executable('manager', test_sources,
-                 calls_sources, calls_enum_sources, calls_resources,
-                 wl_proto_sources, wayland_sources,
+                 calls_sources,
                  c_args : test_cflags,
                  link_args: test_link_args,
                  link_with : calls_vala,
@@ -77,8 +76,7 @@ test('manager', t, env: test_env)
 test_sources = [ 'test-plugins.c' ]
 
 t = executable('plugins', test_sources,
-                 calls_sources, calls_enum_sources, calls_resources,
-                 wl_proto_sources, wayland_sources,
+                 calls_sources,
                  c_args : test_cflags,
                  link_args: test_link_args,
                  link_with : calls_vala,
@@ -92,8 +90,6 @@ test('plugins', t, env: test_env)
 test_sources = [ 'test-sip.c' ]
 t = executable('sip', test_sources,
                calls_sources, sip_sources,
-               calls_enum_sources, calls_resources,
-               wl_proto_sources, wayland_sources,
                c_args : test_cflags_with_test_define,
                link_args: test_link_args,
                link_with : calls_vala,