Patchwork [for-1.1] Makefile: Fix QOM dependencies

login
register
mail settings
Submitter Andreas Färber
Date May 27, 2012, 12:29 a.m.
Message ID <1338078550-22119-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/161512/
State New
Headers show

Comments

Andreas Färber - May 27, 2012, 12:29 a.m.
Dependency files qom/*.d were not included by Makefile, causing changes
in object.h (e.g., changes to struct Object) not to propagate to
qom-qobject.o, container.o and cpu.o. Add qom/*.d to the wildcard list.

libuser/qom/cpu.o was unaffected since Makefile.user includes */*.d.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Färber - May 27, 2012, 1:01 a.m.
Am 27.05.2012 02:29, schrieb Andreas Färber:
> Dependency files qom/*.d were not included by Makefile, causing changes
> in object.h (e.g., changes to struct Object) not to propagate to
> qom-qobject.o, container.o and cpu.o. Add qom/*.d to the wildcard list.
> 
> libuser/qom/cpu.o was unaffected since Makefile.user includes */*.d.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 9b7a85e..0bb0529 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -400,4 +400,4 @@ tar:
>  	rm -rf /tmp/$(FILE)
>  
>  # Include automatically generated dependency files
> --include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
> +-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d qom/*.d)

I wonder if, independently of QOM, we also need to consider...
- qapi-generated/*.d,
- usb/*.d and
- tests/*.d?

Andreas

Patch

diff --git a/Makefile b/Makefile
index 9b7a85e..0bb0529 100644
--- a/Makefile
+++ b/Makefile
@@ -400,4 +400,4 @@  tar:
 	rm -rf /tmp/$(FILE)
 
 # Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
+-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d qom/*.d)