diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-03-20 16:26:13 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 15:10:54 +0100 |
| commit | d12ab27c8e0c6c7d5580d6790fac73e6a433ebc0 (patch) | |
| tree | 1b8ce5a1146b0491ae23dfe297944469309c9398 /gtk | |
| parent | 7738688c00f6101ffb91751dbf22593ce8c61d65 (diff) | |
| download | gtk+-d12ab27c8e0c6c7d5580d6790fac73e6a433ebc0.tar.gz | |
meson: gtk: remove internal static libs from declared gtk dependency
gdk and gsk are no longer separate libs but part of gtk now, so any
Gtk+ user should just link to gtk, there's no need to additionally
link against all those static helper libs that go into the gtk lib.
This means we need to specifically add confinc to include_directories
in more places to make sure the right config.h (i.e. ours) gets
included and not a subproject's like graphene's config.h.
Not dragging in static libs also fixes the issue of all executables
having to be relinked for any and all changes. With this change
it's super-fast now and can be skipped for most changes that don't
touch the external ABI.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/meson.build b/gtk/meson.build index 3fb7d7257b..8f9c08cb03 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -804,7 +804,8 @@ libgtk_dep = declare_dependency( gtktypebuiltins_c, gtktypebuiltins_h, ], - dependencies: gtk_deps + [libgdk_dep, libgsk_dep], + include_directories: [confinc], + dependencies: gtk_deps, link_with: libgtk, link_args: ['-Bsymbolic'], include_directories: [confinc, gtkinc] |