diff options
| author | Victor Kaplansky | 2015-08-09 11:39:59 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-08-13 13:08:25 +0200 |
| commit | 27fa7479801ac23609110535a997b2e3ed6eb867 (patch) | |
| tree | fbdb3219027a9ccbbe5eb3637414465fe9b2b01c /rules.mak | |
| parent | make: fix where dependency *.d are stored. (diff) | |
| download | qemu-27fa7479801ac23609110535a997b2e3ed6eb867.tar.gz qemu-27fa7479801ac23609110535a997b2e3ed6eb867.tar.xz qemu-27fa7479801ac23609110535a997b2e3ed6eb867.zip | |
make: load only required dependency files.
The old rules.mak loads dependency .d files using include directive
with file glob pattern "*.d". This breaks the build when build tree has
left-over *.d files from another build.
This patch fixes this by
- loading precise list of .d files made from *.o and *.mo.
- specifying explicit list of required dependency info files for
*.hex autogenerated sources.
Note that Makefile still includes some .d in root directory by including
"*.d".
Signed-off-by: Victor Kaplansky <victork@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'rules.mak')
| -rw-r--r-- | rules.mak | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -368,6 +368,6 @@ define unnest-vars $(error $o added in $v but $o-objs is not set))) $(shell mkdir -p ./ $(sort $(dir $($v)))) # Include all the .d files - $(eval -include $(addsuffix *.d, $(sort $(dir $($v))))) + $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$($v)))) $(eval $v := $(filter-out %/,$($v)))) endef |