diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2017-12-21 18:57:25 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-12-21 18:57:25 +0000 |
commit | 18a56cd795a080f96a613706e702fb1a4f3ab466 (patch) | |
tree | 741032799faedd520871d4d0a7d24b543c8d9a9e /gtk | |
parent | cc80a2ec8e327cbd889498b111b0c4f4fac90709 (diff) | |
download | gtk+-18a56cd795a080f96a613706e702fb1a4f3ab466.tar.gz |
build: Ensure we introspect the print operation sources
The documentation and annotations for some of the print API is defined
in platform-specific source files, so we need to ensure we're passing
those files to the introspection scanner in order to avoid warnings, and
to get the appropriate introspected API.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/meson.build | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/gtk/meson.build b/gtk/meson.build index 4b18f532fa..d759ae6665 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -604,7 +604,7 @@ if os_unix ] install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk') - gtk_sources += files([ + gtk_unix_print_sources = files([ 'gtkcustompaperunixdialog.c', 'gtkpagesetupunixdialog.c', 'gtkprintbackend.c', @@ -618,15 +618,19 @@ if os_unix 'gtkprintunixdialog.c', 'gtksearchenginetracker.c', ]) + + gtk_sources += gtk_unix_print_sources endif if os_win32 - gtk_sources += [ + gtk_win32_print_sources = files([ 'gtkprint-win32.c', 'gtkprintoperation-win32.c', 'gtkfilechoosernativewin32.c', 'gtkwin32.c', - ] + ]) + + gtk_sources += gtk_win32_print_sources if cc.has_header_symbol('windows.h', 'IPrintDialogCallback') cdata.set('HAVE_IPRINTDIALOGCALLBACK', 1) @@ -650,14 +654,14 @@ if win32_enabled endif if quartz_enabled - gtk_sources += [ + gtk_sources += files([ 'gtksearchenginequartz.c', 'gtkmountoperation-stub.c', 'gtkapplication-quartz.c', 'gtkapplication-quartz-menu.c', 'gtkfilechoosernativequartz.c', 'gtkquartz.c', - ] + ]) gtk_cargs += ['-xobjective-c'] # FIXME? maybe add_languages() instead? endif @@ -981,12 +985,26 @@ if build_gir gsk_gir_dep = declare_dependency(dependencies: [gdk_gir_dep, graphene_dep], sources: gsk_gir) gtk_dep_sources += gsk_gir + gtk_introspection_sources = [ + gtk_public_headers, + gtk_public_sources, + dnd_sources, + a11y_headers, + a11y_sources, + gtktypebuiltins_h, + gtkversion, + ] + + if os_unix + gtk_introspection_sources += gtk_unix_print_sources + endif + + if os_win32 + gtk_introspection_sources += gtk_win32_print_sources + endif gtk_gir = gnome.generate_gir(libgtk, - sources: gtk_public_headers + gtk_public_sources + dnd_sources + a11y_headers + a11y_sources + [ - gtktypebuiltins_h, - gtkversion, - ], + sources: gtk_introspection_sources, namespace: 'Gtk', nsversion: gtk_api_version, identifier_prefix: 'Gtk', |