On Tue, Dec 04, 2012 at 05:03:36PM +0100, Andreas Färber wrote: > Am 04.12.2012 14:19, schrieb Eduardo Habkost: > > The flag is necessary for code that doesn't use the variables from > > Makefile (but use Makefile.objs), like libcacard/ and stubs/. > > > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > > I don't quite understand the rationale of this patch. > libcacard/ and stubs/ shouldn't need vl.o, do they? The CFLAGS move > makes more sense to me.
The change is not about vl.o, is about having having the header files from include/qemu available when building libcacard and libqemustub. I had to do that because now some files included by files in libcacard/ and stubs/ end up including header files from include/qemu. e.g.: lt CC stubs/sysbus.lo In file included from /home/ehabkost/pessoal/proj/virt/qemu/stubs/sysbus.c:1:0: /home/ehabkost/pessoal/proj/virt/qemu/hw/qdev-core.h:7:25: fatal error: qemu/object.h: No such file or directory compilation terminated. make[1]: *** [stubs/sysbus.lo] Error 1 make: *** [subdir-libcacard] Error 2 I remember seeing a similar error when building libcacard while working in this series, but now I can't trigger it anymore. > > Paolo, can you take a look please? > > Thanks, > Andreas > > > --- > > Makefile | 1 - > > Makefile.objs | 15 +++++++++------ > > 2 files changed, 9 insertions(+), 7 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index 9ecbcbb..739d9cd 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -145,7 +145,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += > > $(FMOD_CFLAGS) > > > > QEMU_CFLAGS+=$(CURL_CFLAGS) > > > > -QEMU_CFLAGS += -I$(SRC_PATH)/include > > > > ui/cocoa.o: ui/cocoa.m > > > > diff --git a/Makefile.objs b/Makefile.objs > > index 3c7abca..0a0a33a 100644 > > --- a/Makefile.objs > > +++ b/Makefile.objs > > @@ -1,4 +1,13 @@ > > ####################################################################### > > +# general compiler flags > > + > > +QEMU_CFLAGS += $(GLIB_CFLAGS) > > +QEMU_CFLAGS += -I$(SRC_PATH)/include > > + > > +vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) > > +vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) > > + > > +####################################################################### > > # Stub library, linked in tools > > stub-obj-y = stubs/ > > > > @@ -236,12 +245,6 @@ universal-obj-y += $(qapi-obj-y) > > qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o > > qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o > > > > -vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) > > - > > -vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) > > - > > -QEMU_CFLAGS+=$(GLIB_CFLAGS) > > - > > nested-vars += \ > > stub-obj-y \ > > qga-obj-y \ > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg -- Eduardo
