depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-04 20:07:36 +00:00
Code Issues Releases Wiki Activity

build: deduplicate sources

Browse source 
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.
This commit is contained in:
Guido Günther 2021-04-06 12:44:46 +02:00
parent 5933a4005d
commit 443d23dd56
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/meson.build
View file

@ -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)

11
src/meson.build
View file

@ -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,

12
tests/meson.build
View file

@ -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,