diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-04-25 17:43:12 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-04-30 18:11:40 +0100 |
| commit | b34a6a8a6debffa62ca103fedf94787a6f8d94df (patch) | |
| tree | bdae110477053e70bb9fc8a455233bb737389e3d | |
| parent | 56245497587534d903af48619d0e7e328b5aad2f (diff) | |
| download | gdk-pixbuf-b34a6a8a6debffa62ca103fedf94787a6f8d94df.tar.gz | |
meson: Limit use of pixops static library
We really only care about it as a library in order to build a test. We
can simply include the sources into the main shared library.
| -rw-r--r-- | gdk-pixbuf/meson.build | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/pixops/meson.build | 17 |
2 files changed, 17 insertions, 9 deletions
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build index 66946b9af..0e6be215e 100644 --- a/gdk-pixbuf/meson.build +++ b/gdk-pixbuf/meson.build @@ -156,13 +156,16 @@ endif # The main gdk-pixbuf shared library gdkpixbuf = library('gdk_pixbuf-2.0', - gdkpixbuf_sources + gdkpixbuf_enums + gdkpixbuf_marshals, + gdkpixbuf_sources + pixops_sources + gdkpixbuf_enums + gdkpixbuf_marshals, soversion: soversion, version: libversion, c_args: common_cflags + gdk_pixbuf_cflags + included_loaders_cflags, link_args: common_ldflags, - include_directories: root_inc, - dependencies: gdk_pixbuf_deps + included_loaders_deps + [ pixops_dep ], + include_directories: [ + root_inc, + include_directories('pixops'), + ], + dependencies: gdk_pixbuf_deps + included_loaders_deps, install: true) gdkpixbuf_dep = declare_dependency(link_with: gdkpixbuf, diff --git a/gdk-pixbuf/pixops/meson.build b/gdk-pixbuf/pixops/meson.build index 20cc99b38..101fbf669 100644 --- a/gdk-pixbuf/pixops/meson.build +++ b/gdk-pixbuf/pixops/meson.build @@ -1,9 +1,14 @@ -pixops = static_library('pixops', 'pixops.c', - include_directories: root_inc, - dependencies: gdk_pixbuf_deps) +pixops_sources = files(['pixops.c']) +pixops = static_library('pixops', + pixops_sources, + include_directories: root_inc, + dependencies: gdk_pixbuf_deps, +) -pixops_dep = declare_dependency(link_with: pixops, - include_directories: [ root_inc, include_directories('.') ], - dependencies: gdk_pixbuf_deps) +pixops_dep = declare_dependency( + link_with: pixops, + include_directories: [ root_inc, include_directories('.') ], + dependencies: gdk_pixbuf_deps, +) executable('timescale', 'timescale.c', dependencies: pixops_dep) |