Commit 15564d85 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4adf4180

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ endif 
-include $(SUBDIR_DEVICES_MAK_DEP)



%/config-devices.mak: default-configs/%.mak

	$(call quiet-command,$(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $@.tmp $<, "  GEN   $@.tmp")

	$(call quiet-command, \

            $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > $@.tmp, "  GEN   $@.tmp")

	$(call quiet-command, if test -f $@; then \

	  if cmp -s $@.old $@; then \

	    mv $@.tmp $@; \

scripts/make_device_config.sh

+10 −8
Original line number Diff line number Diff line 
#! /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