On Fri, Dec 14, 2012 at 04:34:29PM +0100, Andreas Färber wrote: > Am 05.12.2012 17:49, 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/. > > > > This also moves the existing CFLAGS lines from Makefile.objs at the > > beginning of the file, to keep them all in the same place. > > > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > > Waiting for ack or nack from Paolo here. I am expecting some overlap > with his header file reorganization series. > > My previous (unanswered?) question was why you are moving vl.o lines in > addition to the QEMU_CFLAGS lines that you mention in the commit message.
I thought this note in the commit message would answer the question: > > This also moves the existing CFLAGS lines from Makefile.objs at the > > beginning of the file, to keep them all in the same place. In other words: it's cosmetic, just to keep all the QEMU_CLFAGS lines inside Makefile.objs grouped in a visible place at the beginning of the file. (You noticed that I am moving the vl.o lines _inside_ Makefile.obj, right? They are not being moved between different files.) > > 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
