| Message ID | 20190321124624.26131-4-lvivier@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | build: cleanup in Makefile.objs | expand |
On 21/03/19 13:46, Laurent Vivier wrote: > We don't need it for softmmu targets. > This is needed for next patch that will build > hw/ directory only for softmmu and not for tools. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > Makefile.objs | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/Makefile.objs b/Makefile.objs > index d90123f1d0a3..3538789808af 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -87,6 +87,11 @@ common-obj-y += qmp.o hmp.o > common-obj-y += qapi/ > endif > > +ifneq ($(CONFIG_USER_ONLY),y) > +# hw/display/edid-generate.c is needed by qemu-edid > +common-obj-y += hw/display/ > +endif Is this needed? The dependency on qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) should be enough for the Makefiles to build hw/display/edid-generate.o. Paolo > ####################################################################### > # Target-independent parts used in system and user emulation > common-obj-y += cpus-common.o >
On 26/03/2019 09:42, Paolo Bonzini wrote: > On 21/03/19 13:46, Laurent Vivier wrote: >> We don't need it for softmmu targets. >> This is needed for next patch that will build >> hw/ directory only for softmmu and not for tools. >> >> Signed-off-by: Laurent Vivier <lvivier@redhat.com> >> --- >> Makefile.objs | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/Makefile.objs b/Makefile.objs >> index d90123f1d0a3..3538789808af 100644 >> --- a/Makefile.objs >> +++ b/Makefile.objs >> @@ -87,6 +87,11 @@ common-obj-y += qmp.o hmp.o >> common-obj-y += qapi/ >> endif >> >> +ifneq ($(CONFIG_USER_ONLY),y) >> +# hw/display/edid-generate.c is needed by qemu-edid >> +common-obj-y += hw/display/ >> +endif > > Is this needed? The dependency on > > qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) > > should be enough for the Makefiles to build hw/display/edid-generate.o. Yes, you're right. I don't know why it failed when I tried. Thanks, Laurent
diff --git a/Makefile.objs b/Makefile.objs index d90123f1d0a3..3538789808af 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -87,6 +87,11 @@ common-obj-y += qmp.o hmp.o common-obj-y += qapi/ endif +ifneq ($(CONFIG_USER_ONLY),y) +# hw/display/edid-generate.c is needed by qemu-edid +common-obj-y += hw/display/ +endif + ####################################################################### # Target-independent parts used in system and user emulation common-obj-y += cpus-common.o
We don't need it for softmmu targets. This is needed for next patch that will build hw/ directory only for softmmu and not for tools. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- Makefile.objs | 5 +++++ 1 file changed, 5 insertions(+)