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/cairo-script | |
| 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/cairo-script')
| -rw-r--r-- | util/cairo-script/meson.build | 24 |
1 files changed, 9 insertions, 15 deletions
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 |