Move generation of config-target.h to Makefile from configure
Patchworks-ID: 35194 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
25be210f69
commit
91880d96a1
@ -26,7 +26,12 @@ LIBS+=-lm
|
|||||||
|
|
||||||
kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
|
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
|
# Dummy command so that make thinks it has done something
|
||||||
@true
|
@true
|
||||||
|
|
||||||
|
17
configure
vendored
17
configure
vendored
@ -2074,7 +2074,6 @@ fi
|
|||||||
for target in $target_list; do
|
for target in $target_list; do
|
||||||
target_dir="$target"
|
target_dir="$target"
|
||||||
config_target_mak=$target_dir/config-target.mak
|
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_arch2=`echo $target | cut -d '-' -f 1`
|
||||||
target_bigendian="no"
|
target_bigendian="no"
|
||||||
case "$target_arch2" in
|
case "$target_arch2" in
|
||||||
@ -2109,10 +2108,6 @@ case "$target" in
|
|||||||
;;
|
;;
|
||||||
esac
|
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
|
||||||
mkdir -p $target_dir/fpu
|
mkdir -p $target_dir/fpu
|
||||||
mkdir -p $target_dir/tcg
|
mkdir -p $target_dir/tcg
|
||||||
@ -2457,18 +2452,6 @@ fi
|
|||||||
echo "LDFLAGS+=$ldflags" >> $config_target_mak
|
echo "LDFLAGS+=$ldflags" >> $config_target_mak
|
||||||
echo "QEMU_CFLAGS+=$cflags" >> $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
|
done # for target in $targets
|
||||||
|
|
||||||
# build tree in object directory if source path is different from current one
|
# build tree in object directory if source path is different from current one
|
||||||
|
Loading…
Reference in New Issue
Block a user