From 76cd14410c2959e022ddc5ff2ffad89d2643f308 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 14 Nov 2011 13:08:47 +0100 Subject: [PATCH] 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 --- examples/Makefile.am | 4 +--- gtk/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 011e5a5574..65de8920c0 100644 --- 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 4d9aa7c903..dc613aa0f1 100644 --- 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