Am 08.02.2012 22:41, schrieb Stefan Weil: > Makefile, Makefile.hw, Makefile.target and libcacard/Makefile > added GLIB_CFLAGS to QEMU_CFLAGS. > > Makefile.objs does this, too, and is included by all other > Makefiles, so GLIB_CFLAGS were added twice (reported by malc). > > Signed-off-by: Stefan Weil <s...@weilnetz.de>
Reviewed-by: Andreas Färber <afaer...@suse.de> Andreas > --- > Makefile | 2 -- > Makefile.hw | 1 - > Makefile.objs | 2 -- > Makefile.target | 1 - > libcacard/Makefile | 2 -- > 5 files changed, 0 insertions(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index 47acf3d..e66e885 100644 > --- a/Makefile > +++ b/Makefile > @@ -114,8 +114,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += > $(FMOD_CFLAGS) > > QEMU_CFLAGS+=$(CURL_CFLAGS) > > -QEMU_CFLAGS+=$(GLIB_CFLAGS) > - > QEMU_CFLAGS += -I$(SRC_PATH)/include > > ui/cocoa.o: ui/cocoa.m > diff --git a/Makefile.hw b/Makefile.hw > index 7b8d068..33f1ab0 100644 > --- a/Makefile.hw > +++ b/Makefile.hw > @@ -10,7 +10,6 @@ include $(SRC_PATH)/rules.mak > $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) > > QEMU_CFLAGS+=-I.. > -QEMU_CFLAGS += $(GLIB_CFLAGS) > QEMU_CFLAGS += -I$(SRC_PATH)/include > > include $(SRC_PATH)/Makefile.objs > diff --git a/Makefile.objs b/Makefile.objs > index ec35320..391e524 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -323,8 +323,6 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) > 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-proxy.o > > hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) > -$(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS) > - > > ###################################################################### > # libdis > diff --git a/Makefile.target b/Makefile.target > index 7ed4979..29fde6e 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -215,7 +215,6 @@ QEMU_CFLAGS += $(VNC_TLS_CFLAGS) > QEMU_CFLAGS += $(VNC_SASL_CFLAGS) > QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) > QEMU_CFLAGS += $(VNC_PNG_CFLAGS) > -QEMU_CFLAGS += $(GLIB_CFLAGS) > > # xen support > obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o > xen-mapcache.o > diff --git a/libcacard/Makefile b/libcacard/Makefile > index a145569..c6a896a 100644 > --- a/libcacard/Makefile > +++ b/libcacard/Makefile > @@ -15,8 +15,6 @@ QEMU_OBJS_LIB=$(addsuffix .lo,$(basename $(QEMU_OBJS))) > > QEMU_CFLAGS+=-I../ > > -QEMU_CFLAGS+=$(GLIB_CFLAGS) > - > libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) > > vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
