From 91880d96a188ed88a1762b6648fb452b3eea845e Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 7 Oct 2009 02:41:01 +0200 Subject: [PATCH] Move generation of config-target.h to Makefile from configure Patchworks-ID: 35194 Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- Makefile.target | 7 ++++++- configure | 17 ----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Makefile.target b/Makefile.target index 5fe9c6e4de..56567ee5c6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -26,7 +26,12 @@ LIBS+=-lm kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) -all: $(PROGS) +config-target.h: config-target.h-timestamp +config-target.h-timestamp: config-target.mak + +all: config-target.h + $(call quiet-command, $(MAKE) $(PROGS),) + # Dummy command so that make thinks it has done something @true diff --git a/configure b/configure index dfc281865a..70363be849 100755 --- a/configure +++ b/configure @@ -2074,7 +2074,6 @@ fi for target in $target_list; do target_dir="$target" config_target_mak=$target_dir/config-target.mak -config_target_h=$target_dir/config-target.h target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" case "$target_arch2" in @@ -2109,10 +2108,6 @@ case "$target" in ;; esac -#echo "Creating $config_target_mak, $config_target_h and $target_dir/Makefile" - -test -f $config_target_h && mv $config_target_h ${config_target_h}~ - mkdir -p $target_dir mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg @@ -2457,18 +2452,6 @@ fi echo "LDFLAGS+=$ldflags" >> $config_target_mak echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak -echo "#include \"../config-host.h\"" > $config_target_h - -/bin/sh $source_path/create_config < $config_target_mak >> $config_target_h - -if test -f ${config_target_h}~ ; then - if cmp -s $config_target_h ${config_target_h}~ ; then - mv ${config_target_h}~ $config_target_h - else - rm ${config_target_h}~ - fi -fi - done # for target in $targets # build tree in object directory if source path is different from current one