diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-12 16:00:05 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-18 12:07:25 +0100 |
| commit | 15564d85afaf1d7b314c858a5a34bda599f4cd14 (patch) | |
| tree | 90f24f3922a1343e0ddc00309bd30e0e4c02b52a /scripts | |
| parent | 4adf4180f284caf4ea9cd83ce37085d50a52603b (diff) | |
| download | qemu-15564d85afaf1d7b314c858a5a34bda599f4cd14.zip qemu-15564d85afaf1d7b314c858a5a34bda599f4cd14.tar.gz qemu-15564d85afaf1d7b314c858a5a34bda599f4cd14.tar.bz2 | |
build: pass .d file name to scripts/make_device_config.sh, fix makefile target
The .d file name must match exactly what is used in the SUBDIR_DEVICES_MAK_DEP
variable. Instead of making assumptions in the make_device_config.sh script,
just pass it in.
Similarly, the makefile target may not match the output file name, because
Makefile uses a temporary file. Instead of making assumptions on what the
Makefile does, emit the config-devices.mak file to stdout, and use the
passed-in destination as the makefile target
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_device_config.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 7958086..c1afb3f 100644 --- a/scripts/make_device_config.sh +++ b/scripts/make_device_config.sh @@ -1,10 +1,12 @@ #! /bin/sh -# Construct a target device config file from a default, pulling in any -# files from include directives. +# Writes a target device config file to stdout, from a default and from +# include directives therein. Also emits Makefile dependencies. +# +# Usage: make_device_config.sh SRC DEPFILE-NAME DEPFILE-TARGET > DEST -dest=$1 -dep=`dirname $1`-`basename $1`.d -src=$2 +src=$1 +dep=$2 +target=$3 src_dir=`dirname $src` all_includes= @@ -22,7 +24,7 @@ while [ -n "$f" ] ; do [ $? = 0 ] || exit 1 all_includes="$all_includes $f" done -process_includes $src > $dest +process_includes $src -cat $src $all_includes | grep -v '^include' > $dest -echo "$1: $all_includes" > $dep +cat $src $all_includes | grep -v '^include' +echo "$target: $all_includes" > $dep |