Commit 68898bc8 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Gerd Hoffmann
Browse files

ui: add x_keymap.o to modules 



x_keymap.o is common to the SDL and GTK+ modules, and it causes the
QEMU binary to link to the X11 libraries.  Add it separately to the
modules to keep the main QEMU binary smaller.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1526560782-18732-1-git-send-email-pbonzini@redhat.com

[ kraxel: fix lm32 target build (milkymist-tmu2) ]

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 08d9864f

hw/display/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o 
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o



common-obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o

milkymist-tmu2.o-cflags := $(X11_CFLAGS)

milkymist-tmu2.o-libs := $(X11_LIBS)



obj-$(CONFIG_OMAP) += omap_dss.o

obj-$(CONFIG_OMAP) += omap_lcdc.o

ui/Makefile.objs

+7 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ common-obj-$(CONFIG_COCOA) += cocoa.o 
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)

common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o



common-obj-$(CONFIG_X11) += x_keymap.o

x_keymap.o-cflags := $(X11_CFLAGS)

x_keymap.o-libs := $(X11_LIBS)



# ui-sdl module

common-obj-$(CONFIG_SDL) += sdl.mo

ifeq ($(CONFIG_SDLABI),1.2)
@@ -46,6 +42,13 @@ gtk.mo-objs += gtk-gl-area.o 
endif

endif



ifeq ($(CONFIG_X11),y)

sdl.mo-objs += x_keymap.o

gtk.mo-objs += x_keymap.o

x_keymap.o-cflags := $(X11_CFLAGS)

x_keymap.o-libs := $(X11_LIBS)

endif



common-obj-$(CONFIG_CURSES) += curses.mo

curses.mo-objs := curses.o

curses.mo-cflags := $(CURSES_CFLAGS)