On Fri, Jun 26, 2020 at 06:43:01PM +0200, Christophe de Dinechin wrote: > If we want to build spice as a separately loadable module, we need to > put all the spice code in one loadable module, because the build > system does not know how to deal with dependencies yet. > > Signed-off-by: Christophe de Dinechin <dinec...@redhat.com> > --- > audio/Makefile.objs | 2 +- > chardev/Makefile.objs | 3 +-- > ui/Makefile.objs | 8 ++++---- > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/audio/Makefile.objs b/audio/Makefile.objs > index b4a4c11f31..298c895ff5 100644 > --- a/audio/Makefile.objs > +++ b/audio/Makefile.objs > @@ -1,5 +1,5 @@ > common-obj-y = audio.o audio_legacy.o noaudio.o wavaudio.o mixeng.o > -common-obj-$(CONFIG_SPICE) += spiceaudio.o > +spice-app.mo-objs += ../audio/spiceaudio.o
Explicitly showing paths in the variables doesn't look right. The make recipes are supposed to automatically expand bare file names to add the right path. This is usually dealt with by a call to the "unnest-vars" function. > common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o > common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o > common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o > diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs > index fc9910d4f2..955fac0cf9 100644 > --- a/chardev/Makefile.objs > +++ b/chardev/Makefile.objs > @@ -22,5 +22,4 @@ common-obj-$(CONFIG_BRLAPI) += baum.o > baum.o-cflags := $(SDL_CFLAGS) > baum.o-libs := $(BRLAPI_LIBS) > > -common-obj-$(CONFIG_SPICE) += spice.mo > -spice.mo-objs := spice.o > +spice-app.mo-objs += ../chardev/spice.o > diff --git a/ui/Makefile.objs b/ui/Makefile.objs > index 504b196479..1ab515e23d 100644 > --- a/ui/Makefile.objs > +++ b/ui/Makefile.objs > @@ -11,7 +11,6 @@ common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o > common-obj-y += input.o input-keymap.o input-legacy.o kbd-state.o > common-obj-y += input-barrier.o > common-obj-$(CONFIG_LINUX) += input-linux.o > -common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o > common-obj-$(CONFIG_COCOA) += cocoa.o > common-obj-$(CONFIG_VNC) += $(vnc-obj-y) > common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o > @@ -53,10 +52,11 @@ curses.mo-objs := curses.o > curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS) > curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS) > > -ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) > -common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo > +common-obj-$(CONFIG_SPICE) += spice-app.mo > +spice-app.mo-objs += spice-core.o spice-input.o spice-display.o > +ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),ym) > +spice-app.mo-objs += spice-app.o > endif > -spice-app.mo-objs := spice-app.o > spice-app.mo-cflags := $(GIO_CFLAGS) > spice-app.mo-libs := $(GIO_LIBS) > > -- > 2.26.2 > > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
