| Message ID | 20200118140619.26333-7-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | buildsys: Build faster (mostly tools and linux-user) | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > To ease review/modifications of this Makefile, group generic > objects first, then system-mode specific ones, and finally > peripherals (which are only used in system-mode). > > No logical changes introduced here. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/core/Makefile.objs | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs > index 2fea68ccf7..a522b7297d 100644 > --- a/hw/core/Makefile.objs > +++ b/hw/core/Makefile.objs > @@ -1,32 +1,32 @@ > # core qdev-related obj files, also used by *-user: > common-obj-y += qdev.o qdev-properties.o > common-obj-y += bus.o > +common-obj-y += cpu.o > +common-obj-y += hotplug.o > +common-obj-y += vmstate-if.o > +# irq.o needed for qdev GPIO handling: how are IRQs relevant to linux-user? or vmstate and hotplug? > +common-obj-y += irq.o > + > common-obj-$(CONFIG_SOFTMMU) += reset.o > common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o > common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o > -# irq.o needed for qdev GPIO handling: > -common-obj-y += irq.o > -common-obj-y += hotplug.o > common-obj-$(CONFIG_SOFTMMU) += nmi.o > common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o > -common-obj-y += cpu.o > -common-obj-y += vmstate-if.o > +common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o > +common-obj-$(CONFIG_SOFTMMU) += sysbus.o > +common-obj-$(CONFIG_SOFTMMU) += machine.o > +common-obj-$(CONFIG_SOFTMMU) += null-machine.o > +common-obj-$(CONFIG_SOFTMMU) += loader.o > +common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o > +obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o > +obj-$(CONFIG_SOFTMMU) += numa.o > > common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o > common-obj-$(CONFIG_XILINX_AXI) += stream.o > common-obj-$(CONFIG_PTIMER) += ptimer.o > -common-obj-$(CONFIG_SOFTMMU) += sysbus.o > -common-obj-$(CONFIG_SOFTMMU) += machine.o > -common-obj-$(CONFIG_SOFTMMU) += loader.o > common-obj-$(CONFIG_FITLOADER) += loader-fit.o > -common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o > common-obj-$(CONFIG_REGISTER) += register.o > common-obj-$(CONFIG_OR_IRQ) += or-irq.o > common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o > common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o > common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o > -common-obj-$(CONFIG_SOFTMMU) += null-machine.o > - > -obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o > -obj-$(CONFIG_SOFTMMU) += numa.o > -common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 2fea68ccf7..a522b7297d 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -1,32 +1,32 @@ # core qdev-related obj files, also used by *-user: common-obj-y += qdev.o qdev-properties.o common-obj-y += bus.o +common-obj-y += cpu.o +common-obj-y += hotplug.o +common-obj-y += vmstate-if.o +# irq.o needed for qdev GPIO handling: +common-obj-y += irq.o + common-obj-$(CONFIG_SOFTMMU) += reset.o common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o -# irq.o needed for qdev GPIO handling: -common-obj-y += irq.o -common-obj-y += hotplug.o common-obj-$(CONFIG_SOFTMMU) += nmi.o common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o -common-obj-y += cpu.o -common-obj-y += vmstate-if.o +common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o +common-obj-$(CONFIG_SOFTMMU) += sysbus.o +common-obj-$(CONFIG_SOFTMMU) += machine.o +common-obj-$(CONFIG_SOFTMMU) += null-machine.o +common-obj-$(CONFIG_SOFTMMU) += loader.o +common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o +obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o +obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o common-obj-$(CONFIG_XILINX_AXI) += stream.o common-obj-$(CONFIG_PTIMER) += ptimer.o -common-obj-$(CONFIG_SOFTMMU) += sysbus.o -common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o -common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_REGISTER) += register.o common-obj-$(CONFIG_OR_IRQ) += or-irq.o common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o - -obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o -obj-$(CONFIG_SOFTMMU) += numa.o -common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
To ease review/modifications of this Makefile, group generic objects first, then system-mode specific ones, and finally peripherals (which are only used in system-mode). No logical changes introduced here. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/core/Makefile.objs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)