qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <famz@redhat.com>, mjt@tls.msk.ru
Subject: [Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target
Date: Fri,  9 May 2014 23:03:35 +0200	[thread overview]
Message-ID: <1399669424-29676-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1399669424-29676-1-git-send-email-pbonzini@redhat.com>

The compiling is done in a subdir, so the extraction of per-object libs
and cflags are referencing objects with ../ prefixed. So prefix the
per-object variables "foo.o-cflags" and "foo.o-libs" to
"../foo.o-cflags" and "../foo.o-libs".

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules.mak b/rules.mak
index 5c454d8..7038576 100644
--- a/rules.mak
+++ b/rules.mak
@@ -228,6 +228,7 @@ endef
 define unnest-vars
 $(eval obj := $1)
 $(eval nested-vars := $2)
+$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
 $(eval old-nested-dirs := )
 $(call unnest-vars-1)
 $(if $1,$(foreach v,$(nested-vars),$(eval \
-- 
1.8.3.1

  reply	other threads:[~2014-05-09 21:04 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-09 21:03 [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09 Paolo Bonzini
2014-05-09 21:03 ` Paolo Bonzini [this message]
2014-05-09 21:03 ` [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL) Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG) Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 07/10] build: add support for per-object -cflags and -libs to all rules Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars Paolo Bonzini
2014-05-09 21:03 ` [Qemu-devel] [PULL 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars Paolo Bonzini
2014-05-13 11:33 ` [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09 Peter Maydell

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=1399669424-29676-2-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=famz@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=qemu-devel@nongnu.org \
    /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).