From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvQ5I-0004uh-MT for qemu-devel@nongnu.org; Thu, 09 Feb 2012 04:14:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvQ5C-0005fO-OK for qemu-devel@nongnu.org; Thu, 09 Feb 2012 04:14:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:32902 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvQ5C-0005f2-GO for qemu-devel@nongnu.org; Thu, 09 Feb 2012 04:14:26 -0500 Message-ID: <4F338E6C.7060002@suse.de> Date: Thu, 09 Feb 2012 10:14:20 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1328737297-32226-1-git-send-email-sw@weilnetz.de> In-Reply-To: <1328737297-32226-1-git-send-email-sw@weilnetz.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] make: Remove duplicate use of GLIB_CFLAGS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: qemu-devel@nongnu.org Am 08.02.2012 22:41, schrieb Stefan Weil: > Makefile, Makefile.hw, Makefile.target and libcacard/Makefile > added GLIB_CFLAGS to QEMU_CFLAGS. >=20 > Makefile.objs does this, too, and is included by all other > Makefiles, so GLIB_CFLAGS were added twice (reported by malc). >=20 > Signed-off-by: Stefan Weil Reviewed-by: Andreas F=E4rber Andreas > --- > Makefile | 2 -- > Makefile.hw | 1 - > Makefile.objs | 2 -- > Makefile.target | 1 - > libcacard/Makefile | 2 -- > 5 files changed, 0 insertions(+), 8 deletions(-) >=20 > 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 +=3D $= (FMOD_CFLAGS) > =20 > QEMU_CFLAGS+=3D$(CURL_CFLAGS) > =20 > -QEMU_CFLAGS+=3D$(GLIB_CFLAGS) > - > QEMU_CFLAGS +=3D -I$(SRC_PATH)/include > =20 > 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) > =20 > QEMU_CFLAGS+=3D-I.. > -QEMU_CFLAGS +=3D $(GLIB_CFLAGS) > QEMU_CFLAGS +=3D -I$(SRC_PATH)/include > =20 > 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) +=3D $(sound-obj-y) > 9pfs-nested-$(CONFIG_VIRTFS) +=3D virtio-9p-proxy.o > =20 > hw-obj-$(CONFIG_REALLY_VIRTFS) +=3D $(addprefix 9pfs/, $(9pfs-nested-y= )) > -$(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=3D$(GLIB_CFLAGS) > - > =20 > ###################################################################### > # 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 +=3D $(VNC_TLS_CFLAGS) > QEMU_CFLAGS +=3D $(VNC_SASL_CFLAGS) > QEMU_CFLAGS +=3D $(VNC_JPEG_CFLAGS) > QEMU_CFLAGS +=3D $(VNC_PNG_CFLAGS) > -QEMU_CFLAGS +=3D $(GLIB_CFLAGS) > =20 > # xen support > obj-$(CONFIG_XEN) +=3D xen-all.o xen_machine_pv.o xen_domainbuild.o xe= n-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=3D$(addsuffix .lo,$(basename $(QEMU_OBJ= S))) > =20 > QEMU_CFLAGS+=3D-I../ > =20 > -QEMU_CFLAGS+=3D$(GLIB_CFLAGS) > - > libcacard.lib-y=3D$(addsuffix .lo,$(basename $(libcacard-y))) > =20 > vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg