diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-18 19:25:43 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-18 19:25:43 +0000 |
| commit | 2d6ebb0c2c4152545677ce92ccd4684eb20b931a (patch) | |
| tree | 4e7896bea5fc585aa6627eb725fcaee6ea5b52dd | |
| parent | e5289087edbb66ac02729211ec46cfb7acbd5f1c (diff) | |
kqemu: only compile kqemu.o if actually needed
kqemu.o is compiled even if kqemu support is disabled. This is useless
(kqemu.o should provide nothing that is actually used in that case) and
slightly confusing. So introduce CONFIG_KQEMU for optionally compiling
kqemu.o.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7185 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | Makefile.target | 5 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index dae339bc2e..b27696aa4f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -131,8 +131,11 @@ all: $(PROGS) ######################################################### # cpu emulator library -LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\ +LIBOBJS=exec.o translate-all.o cpu-exec.o\ translate.o host-utils.o +ifdef CONFIG_KQEMU +LIBOBJS+= kqemu.o +endif # TCG code generator LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) @@ -1769,6 +1769,7 @@ case "$target_cpu" in echo "#define TARGET_I386 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" then + echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define USE_KQEMU 1" >> $config_h fi if test "$kvm" = "yes" ; then @@ -1784,6 +1785,7 @@ case "$target_cpu" in echo "#define TARGET_X86_64 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" then + echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define USE_KQEMU 1" >> $config_h fi if test "$kvm" = "yes" ; then |