qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5a8b23: build: Fix per-object variables for M

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5a8b23: build: Fix per-object variables for Makefile.targe...
Date: Tue, 13 May 2014 05:00:08 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5a8b231e7ed39b25e141e8fbbde48203d2361cc2
      
https://github.com/qemu/qemu/commit/5a8b231e7ed39b25e141e8fbbde48203d2361cc2
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  build: Fix per-object variables for Makefile.target

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 <address@hidden>
Reviewed-by: Michael Tokarev <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5c40c7395db04d4d7f491f116a165db7b8e08bab
      
https://github.com/qemu/qemu/commit/5c40c7395db04d4d7f491f116a165db7b8e08bab
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile.target

  Log Message:
  -----------
  build: simplify Makefile.target a bit, use just one rule for softmmu

On win*, we build QEMU_PROGW (GUI) and create a console app QEMU_PROG
from it, while on non-win*, we make only QEMU_PROG using the same
rules as used for QEMU_PROGW on win*.  Make just one rule for building
main executable, and an additional rule for win* to make console app
from it.  Also consolidate tests for $(QEMU_PROGW).

Signed-off-by: Michael Tokarev <address@hidden>
[Fix user-mode compilation. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d608cc5c53f5cd5631b92b17aa1344210717f5b4
      
https://github.com/qemu/qemu/commit/d608cc5c53f5cd5631b92b17aa1344210717f5b4
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile.target

  Log Message:
  -----------
  build: simplify Makefile.target around unnest-vars invocations

No need to save/restore obj-y, we can just build all-obj-y incrementally.

Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2115182f0c3125935b18ee788ef5b36c3c68d911
      
https://github.com/qemu/qemu/commit/2115182f0c3125935b18ee788ef5b36c3c68d911
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile
    M Makefile.target

  Log Message:
  -----------
  Makefile: strip tools and modules too

Commit 52ba784d3 replaced $(STRIP_OPT) with $(STRIP) in some
places (for example, Makefile.target), but not all of them.
There are a few places remain in main Makefile which still
uses $(STRIP_OPT).  Replace these places with $(STRIP) too.

While at it, simplify variable pattern substitution of the
surrounding places, change $(patsubst pat,rep,$(var)) into
$(var:pat=rep) which is much easier to read (this is probably
a good idea to do everywhere).

Signed-off-by: Michael Tokarev <address@hidden>
Cc: Fam Zheng <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8f98aeb9c0d242207603fc9115ea226298d45f12
      
https://github.com/qemu/qemu/commit/8f98aeb9c0d242207603fc9115ea226298d45f12
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile.target

  Log Message:
  -----------
  Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL)

$(INSTALL_PROG) is evaluated to libtool if using libtool, while
$(INSTALL) is not.  Use $(INSTALL_PROG) so that libtool is used
with target too when necessary.  This allows, for example, to
link qemu with shared libcacard.

Signed-off-by: Michael Tokarev <address@hidden>
Cc: Fam Zheng <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Alon Levy <address@hidden>
Cc: address@hidden
--
This is done on top of previous patch (using $(STRIP)), but it can
be used by its own.
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 264f8b4fdc7b4ef304c426589b7fe198ca693823
      
https://github.com/qemu/qemu/commit/264f8b4fdc7b4ef304c426589b7fe198ca693823
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG)

We have $(INSTALL_LIB) which is the same as $(INSTALL_PROG) but
uses correct permissions.  Loadable objects (modules) are like
shared libraries, not like programs.

Signed-off-by: Michael Tokarev <address@hidden>
Cc: Fam Zheng <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0db564eee20fd9ce0f6c13a07d421e585777cddc
      
https://github.com/qemu/qemu/commit/0db564eee20fd9ce0f6c13a07d421e585777cddc
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  build: add support for per-object -cflags and -libs to all rules

This is needed in order to use per-object flags variables.

Reviewed-by: Michael Tokarev <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 849d8284c5171dcfe61212019f8457d370e7a6bc
      
https://github.com/qemu/qemu/commit/849d8284c5171dcfe61212019f8457d370e7a6bc
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M Makefile
    M Makefile.objs
    M audio/Makefile.objs
    M backends/Makefile.objs
    M disas/Makefile.objs
    M ui/Makefile.objs

  Log Message:
  -----------
  build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax

Current Makefile system allows using foo.o-cflags variables to store
object-specific CFLAGS.  Convert some usages of old syntax
(using QEMU_CFLAGS += construct) to the new syntax.

Do not touch multifile modules for now, as build system isn't ready for this.

Signed-off-by: Michael Tokarev <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2a8e6c7a85b65c1b8a8af3005d5e8868a73a5d8f
      
https://github.com/qemu/qemu/commit/2a8e6c7a85b65c1b8a8af3005d5e8868a73a5d8f
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  build: simplify and fix fix-obj-vars

fix-obj-vars has the undesired side effect of breaking -cflags
-objs and -libs variables in the toplevel Makefile.objs.  The
variables in the toplevel Makefile.objs do not need any fix,
so fix-obj-vars need not do anything.

Since we are touching it, remove the now unnecessary $(if)
in the callers.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9d171bd9375e4d08feff9adda15163e0811f5f42
      
https://github.com/qemu/qemu/commit/9d171bd9375e4d08feff9adda15163e0811f5f42
  Author: Michael Tokarev <address@hidden>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M Makefile.objs
    M configure
    M hw/usb/Makefile.objs
    M libcacard/Makefile

  Log Message:
  -----------
  libcacard: remove libcacard-specific CFLAGS and LIBS from global vars

Currently all what's needed for single file libcacard/vcard_emul_nss.c
(libnss cflags) and hw/usb/ccid-card-emulated.c (libcacard includes)
together with the libs is added to global QEMU_CFLAGS and libs_softmmu.

Use the cflags only where really used (for two mentioned files), and
libs only where needed.

While at it, rename variables to better reflect reality: libcacard_*
is really nss_*.

This needs a bit more tweaking: $(NSS_LIBS) should not contain $glib_libs
(ditto for _cflags).  But in order to fix it, some more preparations
should be made first.  So add a FIXME comment.

Signed-off-by: Michael Tokarev <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 41a3f3c1bc82caf79eb858f81f43d57265c42d31
      
https://github.com/qemu/qemu/commit/41a3f3c1bc82caf79eb858f81f43d57265c42d31
  Author: Peter Maydell <address@hidden>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M Makefile
    M Makefile.objs
    M Makefile.target
    M audio/Makefile.objs
    M backends/Makefile.objs
    M configure
    M disas/Makefile.objs
    M hw/usb/Makefile.objs
    M libcacard/Makefile
    M rules.mak
    M ui/Makefile.objs

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/configure' into staging

* remotes/bonzini/configure:
  libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
  build: simplify and fix fix-obj-vars
  build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax
  build: add support for per-object -cflags and -libs to all rules
  Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG)
  Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL)
  Makefile: strip tools and modules too
  build: simplify Makefile.target around unnest-vars invocations
  build: simplify Makefile.target a bit, use just one rule for softmmu
  build: Fix per-object variables for Makefile.target

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1b5498f6874a...41a3f3c1bc82
reply via email to
[Prev in Thread] Current Thread [Next in Thread]