From: Daniel P. Berrange Date: Mon, 25 Feb 2013 15:20:43 +0000 (+0000) Subject: Ensure x_keymap.o is built when GTK is enabled X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d20664018a401120af28ff80ac8d22fbc887956;p=qemu.git Ensure x_keymap.o is built when GTK is enabled 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 Message-id: 1361805646-6425-11-git-send-email-berrange@redhat.com Signed-off-by: Anthony Liguori --- diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 85c50cd89b..6ddc0def6d 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -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)