Diff for /qemu/Makefile.objs between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2018/04/24 18:56:10 version 1.1.1.4, 2018/04/24 19:17:13
Line 2 Line 2
 # QObject  # QObject
 qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o  qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
 qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o  qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
 qobject-obj-y += qerror.o error.o  qobject-obj-y += qerror.o error.o qemu-error.o
   
 #######################################################################  #######################################################################
 # oslib-obj-y is code depending on the OS (win32 vs posix)  # oslib-obj-y is code depending on the OS (win32 vs posix)
Line 11  oslib-obj-$(CONFIG_WIN32) += oslib-win32 Line 11  oslib-obj-$(CONFIG_WIN32) += oslib-win32
 oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o  oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
   
 #######################################################################  #######################################################################
   # coroutines
   coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o
   ifeq ($(CONFIG_UCONTEXT_COROUTINE),y)
   coroutine-obj-$(CONFIG_POSIX) += coroutine-ucontext.o
   else
   coroutine-obj-$(CONFIG_POSIX) += coroutine-gthread.o
   endif
   coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o
   
   #######################################################################
 # block-obj-y is code used by both qemu system emulation and qemu-img  # block-obj-y is code used by both qemu system emulation and qemu-img
   
 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o async.o  block-obj-y = cutils.o cache-utils.o qemu-option.o module.o async.o
 block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o  block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o
   block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
 block-obj-$(CONFIG_POSIX) += posix-aio-compat.o  block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o  block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
   
Line 25  block-nested-y += qed-check.o Line 36  block-nested-y += qed-check.o
 block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o  block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o
 block-nested-$(CONFIG_WIN32) += raw-win32.o  block-nested-$(CONFIG_WIN32) += raw-win32.o
 block-nested-$(CONFIG_POSIX) += raw-posix.o  block-nested-$(CONFIG_POSIX) += raw-posix.o
   block-nested-$(CONFIG_LIBISCSI) += iscsi.o
 block-nested-$(CONFIG_CURL) += curl.o  block-nested-$(CONFIG_CURL) += curl.o
 block-nested-$(CONFIG_RBD) += rbd.o  block-nested-$(CONFIG_RBD) += rbd.o
   
Line 65  common-obj-y = $(block-obj-y) blockdev.o Line 77  common-obj-y = $(block-obj-y) blockdev.o
 common-obj-y += $(net-obj-y)  common-obj-y += $(net-obj-y)
 common-obj-y += $(qobject-obj-y)  common-obj-y += $(qobject-obj-y)
 common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))  common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
 common-obj-y += readline.o console.o cursor.o qemu-error.o  common-obj-y += readline.o console.o cursor.o
 common-obj-y += $(oslib-obj-y)  common-obj-y += $(oslib-obj-y)
 common-obj-$(CONFIG_WIN32) += os-win32.o  common-obj-$(CONFIG_WIN32) += os-win32.o
 common-obj-$(CONFIG_POSIX) += os-posix.o  common-obj-$(CONFIG_POSIX) += os-posix.o
   
 common-obj-y += tcg-runtime.o host-utils.o  common-obj-y += tcg-runtime.o host-utils.o main-loop.o
 common-obj-y += irq.o ioport.o input.o  common-obj-y += irq.o input.o
 common-obj-$(CONFIG_PTIMER) += ptimer.o  common-obj-$(CONFIG_PTIMER) += ptimer.o
 common-obj-$(CONFIG_MAX7310) += max7310.o  common-obj-$(CONFIG_MAX7310) += max7310.o
 common-obj-$(CONFIG_WM8750) += wm8750.o  common-obj-$(CONFIG_WM8750) += wm8750.o
Line 89  common-obj-y += i2c.o smbus.o smbus_eepr Line 101  common-obj-y += i2c.o smbus.o smbus_eepr
 common-obj-y += eeprom93xx.o  common-obj-y += eeprom93xx.o
 common-obj-y += scsi-disk.o cdrom.o  common-obj-y += scsi-disk.o cdrom.o
 common-obj-y += scsi-generic.o scsi-bus.o  common-obj-y += scsi-generic.o scsi-bus.o
   common-obj-y += hid.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.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-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o
 common-obj-$(CONFIG_SSI) += ssi.o  common-obj-$(CONFIG_SSI) += ssi.o
Line 151  common-obj-y += qemu-timer.o qemu-timer- Line 164  common-obj-y += qemu-timer.o qemu-timer-
   
 slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.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 += 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  slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o
 common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))  common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
   
 # xen backend driver support  # xen backend driver support
Line 165  user-obj-y = Line 178  user-obj-y =
 user-obj-y += envlist.o path.o  user-obj-y += envlist.o path.o
 user-obj-y += tcg-runtime.o host-utils.o  user-obj-y += tcg-runtime.o host-utils.o
 user-obj-y += cutils.o cache-utils.o  user-obj-y += cutils.o cache-utils.o
   user-obj-y += $(trace-obj-y)
   
 ######################################################################  ######################################################################
 # libhw  # libhw
Line 172  user-obj-y += cutils.o cache-utils.o Line 186  user-obj-y += cutils.o cache-utils.o
 hw-obj-y =  hw-obj-y =
 hw-obj-y += vl.o loader.o  hw-obj-y += vl.o loader.o
 hw-obj-$(CONFIG_VIRTIO) += virtio-console.o  hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
   hw-obj-y += usb-libhw.o
 hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o  hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 hw-obj-y += fw_cfg.o  hw-obj-y += fw_cfg.o
 hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o  hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
Line 206  hw-obj-$(CONFIG_APPLESMC) += applesmc.o Line 221  hw-obj-$(CONFIG_APPLESMC) += applesmc.o
 hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o  hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
 hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o  hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
 hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o  hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o
   hw-obj-$(CONFIG_I8259) += i8259.o
   
 # PPC devices  # PPC devices
 hw-obj-$(CONFIG_OPENPIC) += openpic.o  
 hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o  hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o
 # Mac shared devices  # Mac shared devices
 hw-obj-$(CONFIG_MACIO) += macio.o  hw-obj-$(CONFIG_MACIO) += macio.o
Line 227  hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_ Line 242  hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_
   
 # MIPS devices  # MIPS devices
 hw-obj-$(CONFIG_PIIX4) += piix4.o  hw-obj-$(CONFIG_PIIX4) += piix4.o
   hw-obj-$(CONFIG_G364FB) += g364fb.o
   
 # PCI watchdog devices  # PCI watchdog devices
 hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o  hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
Line 244  hw-obj-$(CONFIG_RTL8139_PCI) += rtl8139. Line 260  hw-obj-$(CONFIG_RTL8139_PCI) += rtl8139.
 hw-obj-$(CONFIG_SMC91C111) += smc91c111.o  hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
 hw-obj-$(CONFIG_LAN9118) += lan9118.o  hw-obj-$(CONFIG_LAN9118) += lan9118.o
 hw-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o  hw-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
   hw-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
   
 # IDE  # IDE
 hw-obj-$(CONFIG_IDE_CORE) += ide/core.o ide/atapi.o  hw-obj-$(CONFIG_IDE_CORE) += ide/core.o ide/atapi.o
Line 289  sound-obj-$(CONFIG_HDA) += intel-hda.o h Line 306  sound-obj-$(CONFIG_HDA) += intel-hda.o h
 adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0  adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)  hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
   
 9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o  9pfs-nested-$(CONFIG_VIRTFS)  = virtio-9p.o
 9pfs-nested-$(CONFIG_VIRTFS) +=  virtio-9p-local.o virtio-9p-xattr.o  9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
 9pfs-nested-$(CONFIG_VIRTFS) +=   virtio-9p-xattr-user.o virtio-9p-posix-acl.o  9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
   9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o cofs.o codir.o cofile.o
   9pfs-nested-$(CONFIG_VIRTFS) += coxattr.o virtio-9p-synth.o
   9pfs-nested-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
   
 hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))  hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))
   $(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS)
   
   
 ######################################################################  ######################################################################
Line 323  trace.h: trace.h-timestamp trace-dtrace. Line 344  trace.h: trace.h-timestamp trace-dtrace.
 else  else
 trace.h: trace.h-timestamp  trace.h: trace.h-timestamp
 endif  endif
 trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak  trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
         $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@,"  GEN   trace.h")          $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@,"  GEN   trace.h")
         @cmp -s $@ trace.h || cp $@ trace.h          @cmp -s $@ trace.h || cp $@ trace.h
   
 trace.c: trace.c-timestamp  trace.c: trace.c-timestamp
 trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak  trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
         $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@,"  GEN   trace.c")          $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@,"  GEN   trace.c")
         @cmp -s $@ trace.c || cp $@ trace.c          @cmp -s $@ trace.c || cp $@ trace.c
   
Line 341  trace-dtrace.h: trace-dtrace.dtrace Line 362  trace-dtrace.h: trace-dtrace.dtrace
 # but that gets picked up by QEMU's Makefile as an external dependency  # but that gets picked up by QEMU's Makefile as an external dependency
 # rule file. So we use '.dtrace' instead  # rule file. So we use '.dtrace' instead
 trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp  trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
 trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak  trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
         $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@,"  GEN   trace-dtrace.dtrace")          $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@,"  GEN   trace-dtrace.dtrace")
         @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace          @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
   
Line 353  trace-dtrace.lo: trace-dtrace.dtrace Line 374  trace-dtrace.lo: trace-dtrace.dtrace
         @echo "missing libtool. please install and rerun configure."; exit 1          @echo "missing libtool. please install and rerun configure."; exit 1
 else  else
 trace-dtrace.lo: trace-dtrace.dtrace  trace-dtrace.lo: trace-dtrace.dtrace
         $(call quiet-command,libtool --mode=compile --tag=CC dtrace -o $@ -G -s $<, "  lt GEN trace-dtrace.o")          $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, "  lt GEN trace-dtrace.o")
 endif  endif
   
 simpletrace.o: simpletrace.c $(GENERATED_HEADERS)  trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
   
 ifeq ($(TRACE_BACKEND),dtrace)  trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
 trace-obj-y = trace-dtrace.o  ifneq ($(TRACE_BACKEND),dtrace)
 else  
 trace-obj-y = trace.o  trace-obj-y = trace.o
 ifeq ($(TRACE_BACKEND),simple)  
 trace-obj-y += simpletrace.o  
 user-obj-y += qemu-timer-common.o  
 endif  
 endif  endif
   
   trace-nested-$(CONFIG_TRACE_DEFAULT) += default.o
   
   trace-nested-$(CONFIG_TRACE_SIMPLE) += simple.o
   trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o
   
   trace-nested-$(CONFIG_TRACE_STDERR) += stderr.o
   
   trace-nested-y += control.o
   
   trace-obj-y += $(addprefix trace/, $(trace-nested-y))
   
   $(trace-obj-y): $(GENERATED_HEADERS)
   
 ######################################################################  ######################################################################
 # smartcard  # smartcard
   
Line 380  qapi-nested-y = qapi-visit-core.o qmp-in Line 409  qapi-nested-y = qapi-visit-core.o qmp-in
 qapi-nested-y += qmp-registry.o qmp-dispatch.o  qapi-nested-y += qmp-registry.o qmp-dispatch.o
 qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))  qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
   
   common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y)
   common-obj-y += qmp.o hmp.o
   
   ######################################################################
   # guest agent
   
   qga-nested-y = guest-agent-commands.o guest-agent-command-state.o
   qga-obj-y = $(addprefix qga/, $(qga-nested-y))
   qga-obj-y += qemu-ga.o qemu-sockets.o module.o qemu-option.o
   qga-obj-$(CONFIG_WIN32) += oslib-win32.o
   qga-obj-$(CONFIG_POSIX) += oslib-posix.o
   
 vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)  vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
   
 vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)  vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
   
 vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS)  QEMU_CFLAGS+=$(GLIB_CFLAGS)
   

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com