qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4f04f1: makefile: merge GENERATED_HEADERS & G


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 4f04f1: makefile: merge GENERATED_HEADERS & GENERATED_SOUR...
Date: Thu, 16 Mar 2017 08:45:11 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4f04f13c2a9aba874797d89a5e37b1f6b5993835
      
https://github.com/qemu/qemu/commit/4f04f13c2a9aba874797d89a5e37b1f6b5993835
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M Makefile
    M Makefile.target
    M target/s390x/Makefile.objs
    M tests/Makefile.include

  Log Message:
  -----------
  makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables

The only functional difference between the GENERATED_HEADERS
and GENERATED_SOURCES variables is that 'Makefile' has a
dependancy on GENERATED_HEADERS, causing generated header files
to be created immediatey at the start of the build process.
There is no reason why this early creation should be restricted
to the .h files, and not include .c files too. Merge both of
the variables into a single GENERATED_FILES variable to make
it clear it is for any type of generated file.

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4175304e591ba3e09861906a8651f243564c0530
      
https://github.com/qemu/qemu/commit/4175304e591ba3e09861906a8651f243564c0530
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  makefile: generate trace-events-all upfront

Files should not be created in the build dir during the
'make install' phase. List 'trace-events-all' as a
generated file so that it gets created upfront during
build.

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29
      
https://github.com/qemu/qemu/commit/8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M Makefile
    M trace/Makefile.objs

  Log Message:
  -----------
  trace: ensure $(tracetool-y) is defined in top level makefile

The build rules for trace files have a dependancy on $(tracetool-y).
This variable populated in the trace/Makefile.objs file and thus its
definition gets pulled into the top level makefile. This happens too
late in the process though, so by the time $(tracetool-y) is defined,
make has already evaluated $(tracetool-y) in the dependancies and
found it to be empty. The result is that when the tracetool source
is changed, the generated files are not rebuilt. The solution is to
define the variable in the top level makefile too

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Tested-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe
      
https://github.com/qemu/qemu/commit/094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M Makefile
    M Makefile.target
    M target/s390x/Makefile.objs
    M tests/Makefile.include
    M trace/Makefile.objs

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging

Pull request

Tracing makefile fixes for QEMU 2.9.

# gpg: Signature made Thu 16 Mar 2017 06:56:10 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: ensure $(tracetool-y) is defined in top level makefile
  makefile: generate trace-events-all upfront
  makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables

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


Compare: https://github.com/qemu/qemu/compare/699f6c6fd420...094a9a7cd677

reply via email to

[Prev in Thread] Current Thread [Next in Thread]