]> git.proxmox.com Git - qemu.git/commitdiff
Ensure x_keymap.o is built when GTK is enabled
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 25 Feb 2013 15:20:43 +0000 (15:20 +0000)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Feb 2013 19:29:53 +0000 (13:29 -0600)
The x_keymap.o file is required by both GTK and SDL builds,
so it must be explicitly listed as a GTK dep to ensure the
linker works when SDL is disabled

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1361805646-6425-11-git-send-email-berrange@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
ui/Makefile.objs

index 85c50cd89beaacf4b1d6aede916e244ee5a20ec3..6ddc0def6d85e6f62ab2d9bd5cbb8d31365837fb 100644 (file)
@@ -13,7 +13,7 @@ common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
 common-obj-$(CONFIG_COCOA) += cocoa.o
 common-obj-$(CONFIG_CURSES) += curses.o
 common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
-common-obj-$(CONFIG_GTK) += gtk.o
+common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
 
 $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS)