qapi: struct_types is a list used like a dict, make it one

[mirror_qemu.git] / scripts / make_device_config.sh

diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 5d14885dfc21f1ac2d285dc36d12a903e9a33ce0..354af317b3ddff748dc3d7847668e0b6e88d2d61 100644 (file)
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -1,11 +1,13 @@
 #! /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.tmp
-dep=$1.d
-src=$2
-src_dir=`dirname $src`
+src=$1
+dep=$2
+target=$3
+src_dir=$(dirname $src)
 all_includes=
 
 process_includes () {
@@ -18,11 +20,11 @@ process_includes () {
 
 f=$src
 while [ -n "$f" ] ; do
-  f=`tr -d '\r' < $f | awk '/^include / {printf "'$src_dir'/%s", $2}'`
+  f=$(cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $2}')
   [ $? = 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