diff options
author | Uli Schlachter <psychon@znc.in> | 2021-05-22 07:59:52 +0200 |
---|---|---|
committer | Uli Schlachter <psychon@znc.in> | 2021-05-22 07:59:52 +0200 |
commit | 1981fb6dfb51f44feb68590f51309520185e0780 (patch) | |
tree | 749946a25b2cd2ce77e2d68e6b21e03ef8924ddc /util | |
parent | 63f0d6268469dcd12316ea405a026f4be900dd79 (diff) | |
download | cairo-1981fb6dfb51f44feb68590f51309520185e0780.tar.gz |
meson: Use more dependency objects
For example, to depend on cairo-script, inccairoscript was added to
"include_directories:" and libcairoscript was added to "link_with:".
This commit instead uses the libcairoscript_dep dependency everywhere.
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'util')
-rw-r--r-- | util/cairo-gobject/meson.build | 9 | ||||
-rw-r--r-- | util/cairo-missing/meson.build | 7 | ||||
-rw-r--r-- | util/cairo-script/meson.build | 24 | ||||
-rw-r--r-- | util/cairo-sphinx/meson.build | 6 | ||||
-rw-r--r-- | util/meson.build | 5 |
5 files changed, 22 insertions, 29 deletions
diff --git a/util/cairo-gobject/meson.build b/util/cairo-gobject/meson.build index e4e3c8302..0a525b6fa 100644 --- a/util/cairo-gobject/meson.build +++ b/util/cairo-gobject/meson.build @@ -8,18 +8,15 @@ cairo_gobject_headers = [ ] libcairogobject = library('cairo-gobject', cairo_gobject_sources, - include_directories: [incbase, incsrc], - dependencies: [glib_dep, gobject_dep], - link_with: [libcairo], + include_directories: [incbase], + dependencies: [glib_dep, gobject_dep, libcairo_dep], soversion: cairo_version_sonum, version: cairo_libversion, install: true, ) -incgobject = include_directories('.') - libcairogobject_dep = declare_dependency(link_with: libcairogobject, - include_directories: [incgobject], + include_directories: include_directories('.'), dependencies: libcairo_dep) pkgmod.generate(libcairogobject, diff --git a/util/cairo-missing/meson.build b/util/cairo-missing/meson.build index 18c6caf33..3280b03fe 100644 --- a/util/cairo-missing/meson.build +++ b/util/cairo-missing/meson.build @@ -3,10 +3,13 @@ cairo_missing_sources = [ 'getline.c', ] -inccairomissing = include_directories('.') - libcairomissing = static_library('cairo-missing', cairo_missing_sources, include_directories: [incbase, incsrc], install: false, build_by_default: false, ) + +libcairomissing_dep = declare_dependency( + link_with: libcairomissing, + include_directories: include_directories('.'), +) diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build index 7a6b55818..653c19d33 100644 --- a/util/cairo-script/meson.build +++ b/util/cairo-script/meson.build @@ -26,18 +26,15 @@ csi_trace_sources = [ libcairoscript = library('cairo-script-interpreter', cairoscript_interpreter_sources, - include_directories: [incbase, incsrc], - dependencies: deps, - link_with: [libcairo], + include_directories: [incbase], + dependencies: deps + [libcairo_dep], soversion: cairo_version_sonum, version: cairo_libversion, install: true, ) -inccairoscript = include_directories('.') - libcairoscript_dep = declare_dependency(link_with: libcairoscript, - include_directories: [inccairoscript], + include_directories: include_directories('.'), dependencies: libcairo_dep) pkgmod.generate(libcairoscript, @@ -49,22 +46,19 @@ pkgmod.generate(libcairoscript, meson.override_dependency('cairo-script-interpreter', libcairoscript_dep) csi_replay_exe = executable('csi-replay', csi_replay_sources, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, + include_directories: [incbase], + dependencies: deps + [libcairo_dep, libcairoscript_dep], ) csi_exec_exe = executable('csi-exec', csi_exec_sources, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, + include_directories: [incbase], + dependencies: deps + [libcairo_dep, libcairoscript_dep], ) if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1 csi_trace_exe = executable('csi-trace', csi_trace_sources, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, + include_directories: [incbase], + dependencies: deps + [libcairo_dep, libcairoscript_dep], ) endif diff --git a/util/cairo-sphinx/meson.build b/util/cairo-sphinx/meson.build index f779744b9..20ea04d7f 100644 --- a/util/cairo-sphinx/meson.build +++ b/util/cairo-sphinx/meson.build @@ -16,10 +16,10 @@ libcairosphinx = library('cairo-sphinx', libcairo_sphinx_sources, libdir = join_paths(get_option('prefix'), get_option('libdir')) cairosphinx_exe = executable('cairo-sphinx', cairo_sphinx_sources, - include_directories: [incbase, incsrc, inccairoscript, incboilerplate], + include_directories: [incbase], c_args: ['-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args, - dependencies: deps + [glib_dep, rt_dep], - link_with: [libcairo, libcairosphinx, libcairoscript, libcairoboilerplate], + dependencies: deps + [glib_dep, rt_dep, libcairo_dep, cairoboilerplate_dep, libcairoscript_dep], + link_with: [libcairosphinx], link_args: extra_link_args, install: true, ) diff --git a/util/meson.build b/util/meson.build index e3a1ace96..0fa8ec758 100644 --- a/util/meson.build +++ b/util/meson.build @@ -52,9 +52,8 @@ foreach util : cairo_utils exe_name = util[0].split('.')[0] util_deps = util.get(1, {}).get('deps', []) executable(exe_name, util[0], - include_directories: [incbase, incsrc, inccairoscript], - dependencies: deps + util_deps, - link_with: [libcairo, libcairoscript], + include_directories: [incbase], + dependencies: deps + util_deps + [libcairo_dep, libcairoscript_dep], ) endforeach |