Fix GDK linking for Gtk typelib and example builds

Add missing GDK linking to GIR build and examples:

  GISCAN Gtk-3.0.gir
  CCLD   gtk-query-immodules-3.0
./.libs/libgtk-3.so: undefined reference to `gdk_keymap_get_modifier_mask'
./.libs/libgtk-3.so: undefined reference to `gdk_modifier_intent_get_type'
./.libs/libgtk-3.so: undefined reference to `gdk_window_begin_resize_drag_for_device'
./.libs/libgtk-3.so: undefined reference to `gdk_event_triggers_context_menu'
collect2: ld returned 1 exit status

  CCLD   grid-packing
../gtk/.libs/libgtk-3.so: undefined reference to `gdk_keymap_get_modifier_mask'
[...]

https://bugzilla.gnome.org/show_bug.cgi?id=664027

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 011e5a55743f25bd19000d5d096df1bc51284280..65de8920c00c51da75fde3c3a377f788df8f9202 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -46,11 +46,9 @@ AM_CPPFLAGS = \
 
 LDADD = \
        $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)
 
-drawing_LDADD = $(LDADD) \
-       $(top_builddir)/gdk/libgdk-3.la
-
 noinst_PROGRAMS = \
        hello-world                             \
        window-default                          \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4d9aa7c9036b03c6699877fe517294ffc844eca4..dc613aa0f181d0b5b0436ff366a41e69acf41c00 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1052,7 +1052,7 @@ Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_CFLAGS = \
                $(AM_CPPFLAGS) \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.la
+Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir