From: "Andreas Färber" <afaerber@suse.de>
To: Stefan Weil <sw@weilnetz.de>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] make: Remove duplicate use of GLIB_CFLAGS
Date: Thu, 09 Feb 2012 10:14:20 +0100 [thread overview]
Message-ID: <4F338E6C.7060002@suse.de> (raw)
In-Reply-To: <1328737297-32226-1-git-send-email-sw@weilnetz.de>
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 <sw@weilnetz.de>
Reviewed-by: Andreas Färber <afaerber@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
next prev parent reply other threads:[~2012-02-09 9:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-08 21:41 [Qemu-devel] [PATCH] make: Remove duplicate use of GLIB_CFLAGS Stefan Weil
2012-02-09 0:16 ` malc
2012-02-09 9:14 ` Andreas Färber [this message]
2012-02-09 16:46 ` malc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F338E6C.7060002@suse.de \
--to=afaerber@suse.de \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).