diff --git a/atk/meson.build b/atk/meson.build index 354fa9735..a52a3b5f3 100644 --- a/atk/meson.build +++ b/atk/meson.build @@ -42,5 +42,4 @@ library('atksharpglue-3', gluegen, install: true) install_infos += [assembly_name, atk_sharp.full_path()] -atk_sharp_dep = declare_dependency(link_with: atk_sharp) - +atk_sharp_dep = declare_dependency(link_with: [glib_sharp, atk_sharp]) diff --git a/cairo/meson.build b/cairo/meson.build index bb7c16cbd..243ad7166 100644 --- a/cairo/meson.build +++ b/cairo/meson.build @@ -70,6 +70,7 @@ cairo_sharp = library(assembly_name, sources, ) install_infos += [assembly_name, cairo_sharp.full_path()] -cairo_sharp_dep = declare_dependency(link_with: cairo_sharp) cairo_api_includes = join_paths(meson.current_source_dir(), 'cairo-api.xml') install_data(cairo_api_includes, install_dir: gapi_xml_installdir) + +cairo_sharp_dep = declare_dependency(link_with: cairo_sharp) diff --git a/gdk/meson.build b/gdk/meson.build index 036f145a5..c2eb13448 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -64,13 +64,14 @@ sources = [ 'Window.cs', ] +deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp] gdk_sharp = library(assembly_name, source_gen, sources, cs_args: ['-unsafe', '-keyfile:' + snk], - link_with: [glib_sharp, pango_sharp, cairo_sharp, gio_sharp], + link_with: deps, install: true, install_dir: lib_install_dir ) install_infos += [assembly_name, gdk_sharp.full_path()] -gdk_sharp_dep = declare_dependency(link_with: gdk_sharp) +gdk_sharp_dep = declare_dependency(link_with: deps + [gdk_sharp]) diff --git a/gio/meson.build b/gio/meson.build index 55021dcd6..f561560a4 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -48,4 +48,4 @@ library('giosharpglue-3', gluegen, install: true) install_infos += [assembly_name, gio_sharp.full_path()] -gio_sharp_dep = declare_dependency(link_with: gio_sharp) +gio_sharp_dep = declare_dependency(link_with: [glib_sharp, gio_sharp]) diff --git a/glib/meson.build b/glib/meson.build index 00e8634c6..f3ed7f00a 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -98,6 +98,7 @@ glib_sharp = library(assembly_name, sources, install_infos += [assembly_name, glib_sharp.full_path()] -glib_sharp_dep = declare_dependency(link_with: glib_sharp) glib_api_includes = join_paths(meson.current_source_dir(), 'glib-api.xml') install_data(glib_api_includes, install_dir: gapi_xml_installdir) + +glib_sharp_dep = declare_dependency(link_with: glib_sharp) diff --git a/gtk/meson.build b/gtk/meson.build index 4ff478712..5c0f5032d 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -132,11 +132,10 @@ sources = [ 'Window.cs', ] +deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp, atk_sharp, gdk_sharp] gtk_sharp = library(assembly_name, source_gen, sources, cs_args: ['-unsafe', '-keyfile:' + snk, '-nowarn:0618,0612,0169'], - link_with: [glib_sharp, pango_sharp, - cairo_sharp, gio_sharp, atk_sharp, - gdk_sharp], + link_with: deps, install: true, install_dir: lib_install_dir ) @@ -152,4 +151,4 @@ library('gtksharpglue-3', gluegen, install: true) install_infos += [assembly_name, gtk_sharp.full_path()] -gtk_sharp_dep = declare_dependency(link_with: gtk_sharp) +gtk_sharp_dep = declare_dependency(link_with: deps + [gtk_sharp]) diff --git a/pango/meson.build b/pango/meson.build index bd51f3efc..f36eacfac 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -59,9 +59,10 @@ sources = [ 'Units.cs', ] +deps = [glib_sharp, cairo_sharp] pango_sharp = library(assembly_name, source_gen, sources, cs_args: ['-unsafe', '-keyfile:' + snk], - link_with: [glib_sharp, cairo_sharp], + link_with: deps, install: true, install_dir: lib_install_dir ) @@ -77,4 +78,4 @@ library('pangosharpglue-3', gluegen, install: true) install_infos += [assembly_name, pango_sharp.full_path()] -pango_sharp_dep = declare_dependency(link_with: pango_sharp) +pango_sharp_dep = declare_dependency(link_with: deps + [pango_sharp])