diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2017-03-23 15:54:58 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 15:10:56 +0100 |
commit | e8509739564e278b2c35a69c75d4dde1ba9b0ab7 (patch) | |
tree | 515775e30d9cc0d4723b8ecdbc7b6d9c8f7987b9 /gtk | |
parent | 1c14e93e691088d2685011641031180f66989561 (diff) | |
download | gtk+-e8509739564e278b2c35a69c75d4dde1ba9b0ab7.tar.gz |
meson: build input modules
We have to work around some ordering problems here. We still
manage to keep most of the guts in modules/input/meson.build,
so it's not too ugly overall.
(The autotools build solves this with a 'make -C ../../input/modules'
inside gtk/Makefile, but that's not something we can or want to do.)
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/meson.build | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/gtk/meson.build b/gtk/meson.build index a843e81ed7..6524de21df 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -770,6 +770,8 @@ gtk_cargs = [ '-DGTK_DATA_PREFIX="'+ get_option('prefix') + '"', ] +gtk_gen_headers = [gtkmarshal_h, gtktypebuiltins_h, gtkprivatetypebuiltins_h, gtkversion] + gtk_sources += [ gtk_dbus_src, gtk_deprecated_sources, @@ -840,11 +842,38 @@ if cc.has_header('langinfo.h') endforeach endif -# check token HAVE__NL_MEASUREMENT_MEASUREMENT -# check token HAVE__NL_PAPER_HEIGHT -# check token HAVE__NL_PAPER_WIDTH -# check token HAVE__NL_TIME_FIRST_WEEKDAY +# Input methods + +gen_headers = [gtk_gen_headers, gsk_gen_headers, gdk_gen_headers] + +included_input_modules = [] +foreach m : inc_im_method_defs # populated in modules/input/meson.build + im_name = m[0] + im_srcs = m[1] + im_args = m[2] + im_libs = m[3] + included_input_modules += static_library('im-@0@'.format(im_name), + im_srcs, gen_headers, + c_args : im_args, + include_directories : [confinc, gdkinc, gtkinc], + dependencies : gtk_deps + im_libs) +endforeach + +foreach m : dyn_im_method_defs # populated in modules/input/meson.build + im_name = m[0] + im_srcs = m[1] + im_args = m[2] + im_libs = m[3] + + shared_module('im-@0@'.format(im_name), im_srcs, gen_headers, + c_args : im_args, + include_directories : [confinc, gdkinc, gtkinc], + dependencies : gtk_deps + im_libs, + name_prefix : '', # we want im-foo.so not libim-foo.so + install_dir : immodules_install_dir, + install : true) +endforeach # Library @@ -853,7 +882,7 @@ libgtk = shared_library('gtk-4', c_args: gtk_cargs, include_directories: [confinc, gdkinc, gtkinc], dependencies: gtk_deps + [libgdk_dep, libgsk_dep], - link_with: [libgdk, libgsk], + link_with: [libgdk, libgsk, included_input_modules], link_args: ['-Bsymbolic'], install: true) |