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-sphinx | |
| 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-sphinx')
| -rw-r--r-- | util/cairo-sphinx/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
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, ) |