It really represent object files shared between all softmmu targets. We will use common-obj-y for objects shared between softmmu and tools on next commit
Signed-off-by: Juan Quintela <quint...@redhat.com> --- Makefile | 4 +- Makefile.objs | 116 +++++++++++++++++++++++++++--------------------------- Makefile.target | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Makefile b/Makefile index 9e090cb..7811d74 100644 --- a/Makefile +++ b/Makefile @@ -87,8 +87,8 @@ ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs endif -$(common-obj-y): $(GENERATED_HEADERS) -$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis +$(softmmu-obj-y): $(GENERATED_HEADERS) +$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(softmmu-obj-y) subdir-libdis $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser diff --git a/Makefile.objs b/Makefile.objs index 9e98a66..b525e81 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -59,54 +59,54 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) # system emulation, i.e. a single QEMU executable should support all # CPUs and machines. -common-obj-y = $(block-obj-y) blockdev.o -common-obj-y += $(net-obj-y) -common-obj-y += $(qobject-obj-y) -common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) -common-obj-y += readline.o console.o cursor.o async.o qemu-error.o -common-obj-y += $(oslib-obj-y) -common-obj-$(CONFIG_WIN32) += os-win32.o -common-obj-$(CONFIG_POSIX) += os-posix.o - -common-obj-y += tcg-runtime.o host-utils.o -common-obj-y += irq.o ioport.o input.o -common-obj-$(CONFIG_PTIMER) += ptimer.o -common-obj-$(CONFIG_MAX7310) += max7310.o -common-obj-$(CONFIG_WM8750) += wm8750.o -common-obj-$(CONFIG_TWL92230) += twl92230.o -common-obj-$(CONFIG_TSC2005) += tsc2005.o -common-obj-$(CONFIG_LM832X) += lm832x.o -common-obj-$(CONFIG_TMP105) += tmp105.o -common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o -common-obj-$(CONFIG_SSD0303) += ssd0303.o -common-obj-$(CONFIG_SSD0323) += ssd0323.o -common-obj-$(CONFIG_ADS7846) += ads7846.o -common-obj-$(CONFIG_MAX111X) += max111x.o -common-obj-$(CONFIG_DS1338) += ds1338.o -common-obj-y += i2c.o smbus.o smbus_eeprom.o -common-obj-y += eeprom93xx.o -common-obj-y += scsi-disk.o cdrom.o -common-obj-y += scsi-generic.o scsi-bus.o -common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o -common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o -common-obj-$(CONFIG_SSI) += ssi.o -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o -common-obj-$(CONFIG_SD) += sd.o -common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o -common-obj-y += bt-hci-csr.o -common-obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o -common-obj-y += qemu-char.o savevm.o #aio.o -common-obj-y += msmouse.o ps2.o -common-obj-y += qdev.o qdev-properties.o -common-obj-y += block-migration.o -common-obj-y += pflib.o -common-obj-y += bitmap.o bitops.o - -common-obj-$(CONFIG_BRLAPI) += baum.o -common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o -common-obj-$(CONFIG_WIN32) += version.o - -common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o +softmmu-obj-y = $(block-obj-y) blockdev.o +softmmu-obj-y += $(net-obj-y) +softmmu-obj-y += $(qobject-obj-y) +softmmu-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) +softmmu-obj-y += readline.o console.o cursor.o async.o qemu-error.o +softmmu-obj-y += $(oslib-obj-y) +softmmu-obj-$(CONFIG_WIN32) += os-win32.o +softmmu-obj-$(CONFIG_POSIX) += os-posix.o + +softmmu-obj-y += tcg-runtime.o host-utils.o +softmmu-obj-y += irq.o ioport.o input.o +softmmu-obj-$(CONFIG_PTIMER) += ptimer.o +softmmu-obj-$(CONFIG_MAX7310) += max7310.o +softmmu-obj-$(CONFIG_WM8750) += wm8750.o +softmmu-obj-$(CONFIG_TWL92230) += twl92230.o +softmmu-obj-$(CONFIG_TSC2005) += tsc2005.o +softmmu-obj-$(CONFIG_LM832X) += lm832x.o +softmmu-obj-$(CONFIG_TMP105) += tmp105.o +softmmu-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o +softmmu-obj-$(CONFIG_SSD0303) += ssd0303.o +softmmu-obj-$(CONFIG_SSD0323) += ssd0323.o +softmmu-obj-$(CONFIG_ADS7846) += ads7846.o +softmmu-obj-$(CONFIG_MAX111X) += max111x.o +softmmu-obj-$(CONFIG_DS1338) += ds1338.o +softmmu-obj-y += i2c.o smbus.o smbus_eeprom.o +softmmu-obj-y += eeprom93xx.o +softmmu-obj-y += scsi-disk.o cdrom.o +softmmu-obj-y += scsi-generic.o scsi-bus.o +softmmu-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o +softmmu-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o +softmmu-obj-$(CONFIG_SSI) += ssi.o +softmmu-obj-$(CONFIG_SSI_SD) += ssi-sd.o +softmmu-obj-$(CONFIG_SD) += sd.o +softmmu-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o +softmmu-obj-y += bt-hci-csr.o +softmmu-obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o +softmmu-obj-y += qemu-char.o savevm.o #aio.o +softmmu-obj-y += msmouse.o ps2.o +softmmu-obj-y += qdev.o qdev-properties.o +softmmu-obj-y += block-migration.o +softmmu-obj-y += pflib.o +softmmu-obj-y += bitmap.o bitops.o + +softmmu-obj-$(CONFIG_BRLAPI) += baum.o +softmmu-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o +softmmu-obj-$(CONFIG_WIN32) += version.o + +softmmu-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o @@ -122,7 +122,7 @@ audio-obj-$(CONFIG_WINWAVE) += winwaveaudio.o audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o audio-obj-y += wavcapture.o -common-obj-y += $(addprefix audio/, $(audio-obj-y)) +softmmu-obj-y += $(addprefix audio/, $(audio-obj-y)) ui-obj-y += keymaps.o ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o @@ -139,22 +139,22 @@ ui-obj-y += vnc-jobs-async.o else ui-obj-y += vnc-jobs-sync.o endif -common-obj-y += $(addprefix ui/, $(ui-obj-y)) +softmmu-obj-y += $(addprefix ui/, $(ui-obj-y)) -common-obj-y += iov.o acl.o -common-obj-$(CONFIG_THREAD) += qemu-thread.o -common-obj-$(CONFIG_POSIX) += compatfd.o -common-obj-y += notify.o event_notifier.o -common-obj-y += qemu-timer.o qemu-timer-common.o +softmmu-obj-y += iov.o acl.o +softmmu-obj-$(CONFIG_THREAD) += qemu-thread.o +softmmu-obj-$(CONFIG_POSIX) += compatfd.o +softmmu-obj-y += notify.o event_notifier.o +softmmu-obj-y += qemu-timer.o qemu-timer-common.o slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o -common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) +softmmu-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) # xen backend driver support -common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o -common-obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o +softmmu-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o +softmmu-obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o ###################################################################### # libuser diff --git a/Makefile.target b/Makefile.target index f0df98e..f77b0dc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -343,7 +343,7 @@ monitor.o: hmp-commands.h qmp-commands.h $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) -obj-y += $(addprefix ../, $(common-obj-y)) +obj-y += $(addprefix ../, $(softmmu-obj-y)) obj-y += $(addprefix ../libdis/, $(libdis-y)) obj-y += $(libobj-y) obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y)) -- 1.7.4