rename s/config_mak/config_host_mak/ and s/config_h/config_host_h/

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

1 files changed, 155 insertions, 156 deletions

diff --git a/configure b/configure
index fdfef1b7b7..3b25c75031 100755
--- a/configure
+++ b/configure
@@ -1460,40 +1460,41 @@ fi
 #if test "$sdl_static" = "no"; then
 #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
 #fi
-config_mak="config-host.mak"
-config_h="config-host.h"
 
-#echo "Creating $config_mak and $config_h"
-
-test -f $config_h && mv $config_h ${config_h}~
-
-echo "# Automatically generated by configure - do not modify" > $config_mak
-printf "# Configured with:" >> $config_mak
-printf " '%s'" "$0" "$@" >> $config_mak
-echo >> $config_mak
-echo "/* Automatically generated by configure - do not modify */" > $config_h
-
-echo "prefix=$prefix" >> $config_mak
-echo "bindir=\${prefix}$binsuffix" >> $config_mak
-echo "mandir=\${prefix}$mansuffix" >> $config_mak
-echo "datadir=\${prefix}$datasuffix" >> $config_mak
-echo "docdir=\${prefix}$docsuffix" >> $config_mak
-echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
-echo "MAKE=$make" >> $config_mak
-echo "INSTALL=$install" >> $config_mak
-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
-echo "CC=$cc" >> $config_mak
-echo "HOST_CC=$host_cc" >> $config_mak
-echo "AR=$ar" >> $config_mak
-echo "OBJCOPY=$objcopy" >> $config_mak
-echo "LD=$ld" >> $config_mak
-echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
-echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
-echo "EXESUF=$EXESUF" >> $config_mak
-echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
-echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak
+config_host_mak="config-host.mak"
+config_host_h="config-host.h"
+
+#echo "Creating $config_host_mak and $config_host_h"
+
+test -f $config_host_h && mv $config_host_h ${config_host_h}~
+
+echo "# Automatically generated by configure - do not modify" > $config_host_mak
+printf "# Configured with:" >> $config_host_mak
+printf " '%s'" "$0" "$@" >> $config_host_mak
+echo >> $config_host_mak
+echo "/* Automatically generated by configure - do not modify */" > $config_host_h
+
+echo "prefix=$prefix" >> $config_host_mak
+echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
+echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
+echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
+echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
+echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h
+echo "MAKE=$make" >> $config_host_mak
+echo "INSTALL=$install" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "CC=$cc" >> $config_host_mak
+echo "HOST_CC=$host_cc" >> $config_host_mak
+echo "AR=$ar" >> $config_host_mak
+echo "OBJCOPY=$objcopy" >> $config_host_mak
+echo "LD=$ld" >> $config_host_mak
+echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
+echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
+echo "EXESUF=$EXESUF" >> $config_host_mak
+echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
+echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
 case "$cpu" in
   i386|x86_64|alpha|cris|hppa|ia64|m68k|microbaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
     ARCH=$cpu
@@ -1506,39 +1507,39 @@ case "$cpu" in
     exit 1
   ;;
 esac
-echo "ARCH=$ARCH" >> $config_mak
+echo "ARCH=$ARCH" >> $config_host_mak
 arch_name=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
-echo "#define HOST_$arch_name 1" >> $config_h
+echo "#define HOST_$arch_name 1" >> $config_host_h
 
 if test "$debug_tcg" = "yes" ; then
-  echo "#define DEBUG_TCG 1" >> $config_h
+  echo "#define DEBUG_TCG 1" >> $config_host_h
 fi
 if test "$debug" = "yes" ; then
-  echo "#define DEBUG_EXEC 1" >> $config_h
+  echo "#define DEBUG_EXEC 1" >> $config_host_h
 fi
 if test "$sparse" = "yes" ; then
-  echo "CC      := REAL_CC=\"\$(CC)\" cgcc"       >> $config_mak
-  echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_mak
-  echo "CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak
+  echo "CC      := REAL_CC=\"\$(CC)\" cgcc"       >> $config_host_mak
+  echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_host_mak
+  echo "CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
 fi
 if test "$strip_opt" = "yes" ; then
-  echo "STRIP_OPT=-s" >> $config_mak
+  echo "STRIP_OPT=-s" >> $config_host_mak
 fi
 if test "$bigendian" = "yes" ; then
-  echo "WORDS_BIGENDIAN=yes" >> $config_mak
-  echo "#define WORDS_BIGENDIAN 1" >> $config_h
+  echo "WORDS_BIGENDIAN=yes" >> $config_host_mak
+  echo "#define WORDS_BIGENDIAN 1" >> $config_host_h
 fi
-echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
+echo "#define HOST_LONG_BITS $hostlongbits" >> $config_host_h
 if test "$mingw32" = "yes" ; then
-  echo "CONFIG_WIN32=y" >> $config_mak
-  echo "#define CONFIG_WIN32 1" >> $config_h
+  echo "CONFIG_WIN32=y" >> $config_host_mak
+  echo "#define CONFIG_WIN32 1" >> $config_host_h
 else
   cat > $TMPC << EOF
 #include <byteswap.h>
 int main(void) { return bswap_32(0); }
 EOF
   if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
+    echo "#define HAVE_BYTESWAP_H 1" >> $config_host_h
   fi
   cat > $TMPC << EOF
 #include <sys/endian.h>
@@ -1547,106 +1548,106 @@ EOF
 int main(void) { return bswap32(0); }
 EOF
   if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_host_h
   fi
 fi
 
 if [ "$openbsd" = "yes" ] ; then
-  echo "#define ENOTSUP 4096" >> $config_h
+  echo "#define ENOTSUP 4096" >> $config_host_h
 fi
 
 if test "$darwin" = "yes" ; then
-  echo "CONFIG_DARWIN=y" >> $config_mak
-  echo "#define CONFIG_DARWIN 1" >> $config_h
+  echo "CONFIG_DARWIN=y" >> $config_host_mak
+  echo "#define CONFIG_DARWIN 1" >> $config_host_h
 fi
 
 if test "$aix" = "yes" ; then
-  echo "CONFIG_AIX=y" >> $config_mak
-  echo "#define CONFIG_AIX 1" >> $config_h
+  echo "CONFIG_AIX=y" >> $config_host_mak
+  echo "#define CONFIG_AIX 1" >> $config_host_h
 fi
 
 if test "$solaris" = "yes" ; then
-  echo "CONFIG_SOLARIS=y" >> $config_mak
-  echo "#define HOST_SOLARIS $solarisrev" >> $config_h
+  echo "CONFIG_SOLARIS=y" >> $config_host_mak
+  echo "#define HOST_SOLARIS $solarisrev" >> $config_host_h
   if test "$needs_libsunmath" = "yes" ; then
-    echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
-    echo "#define NEEDS_LIBSUNMATH 1" >> $config_h
+    echo "NEEDS_LIBSUNMATH=yes" >> $config_host_mak
+    echo "#define NEEDS_LIBSUNMATH 1" >> $config_host_h
   fi
 fi
 if test -n "$sparc_cpu"; then
-  echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak
-  echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
+  echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_host_mak
+  echo "#define __sparc_${sparc_cpu}__ 1" >> $config_host_h
 fi
 if test "$gprof" = "yes" ; then
-  echo "TARGET_GPROF=yes" >> $config_mak
-  echo "#define HAVE_GPROF 1" >> $config_h
+  echo "TARGET_GPROF=yes" >> $config_host_mak
+  echo "#define HAVE_GPROF 1" >> $config_host_h
 fi
 if test "$static" = "yes" ; then
-  echo "CONFIG_STATIC=y" >> $config_mak
-  echo "#define CONFIG_STATIC 1" >> $config_h
+  echo "CONFIG_STATIC=y" >> $config_host_mak
+  echo "#define CONFIG_STATIC 1" >> $config_host_h
 fi
 if test $profiler = "yes" ; then
-  echo "#define CONFIG_PROFILER 1" >> $config_h
+  echo "#define CONFIG_PROFILER 1" >> $config_host_h
 fi
 if test "$slirp" = "yes" ; then
-  echo "CONFIG_SLIRP=y" >> $config_mak
-  echo "#define CONFIG_SLIRP 1" >> $config_h
+  echo "CONFIG_SLIRP=y" >> $config_host_mak
+  echo "#define CONFIG_SLIRP 1" >> $config_host_h
 fi
 if test "$vde" = "yes" ; then
-  echo "CONFIG_VDE=y" >> $config_mak
-  echo "#define CONFIG_VDE 1" >> $config_h
-  echo "VDE_LIBS=-lvdeplug" >> $config_mak
+  echo "CONFIG_VDE=y" >> $config_host_mak
+  echo "#define CONFIG_VDE 1" >> $config_host_h
+  echo "VDE_LIBS=-lvdeplug" >> $config_host_mak
 fi
 for card in $audio_card_list; do
     def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
-    echo "$def=y" >> $config_mak
-    echo "#define $def 1" >> $config_h
+    echo "$def=y" >> $config_host_mak
+    echo "#define $def 1" >> $config_host_h
 done
-echo "#define AUDIO_DRIVERS \\" >> $config_h
+echo "#define AUDIO_DRIVERS \\" >> $config_host_h
 for drv in $audio_drv_list; do
-    echo "    &${drv}_audio_driver, \\" >>$config_h
+    echo "    &${drv}_audio_driver, \\" >>$config_host_h
     def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
-    echo "$def=y" >> $config_mak
+    echo "$def=y" >> $config_host_mak
     if test "$drv" = "fmod"; then
-        echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
-        echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
+        echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak
+        echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak
     elif test "$drv" = "oss"; then
-        echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak
+        echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
     fi
 done
-echo "" >>$config_h
+echo "" >>$config_host_h
 if test "$mixemu" = "yes" ; then
-  echo "CONFIG_MIXEMU=y" >> $config_mak
-  echo "#define CONFIG_MIXEMU 1" >> $config_h
+  echo "CONFIG_MIXEMU=y" >> $config_host_mak
+  echo "#define CONFIG_MIXEMU 1" >> $config_host_h
 fi
 if test "$vnc_tls" = "yes" ; then
-  echo "CONFIG_VNC_TLS=y" >> $config_mak
-  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
-  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
-  echo "#define CONFIG_VNC_TLS 1" >> $config_h
+  echo "CONFIG_VNC_TLS=y" >> $config_host_mak
+  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
+  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
+  echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
 fi
 if test "$vnc_sasl" = "yes" ; then
-  echo "CONFIG_VNC_SASL=y" >> $config_mak
-  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
-  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
-  echo "#define CONFIG_VNC_SASL 1" >> $config_h
+  echo "CONFIG_VNC_SASL=y" >> $config_host_mak
+  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
+  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
+  echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
 fi
 if test "$fnmatch" = "yes" ; then
-  echo "#define HAVE_FNMATCH_H 1" >> $config_h
+  echo "#define HAVE_FNMATCH_H 1" >> $config_host_h
 fi
 qemu_version=`head $source_path/VERSION`
-echo "VERSION=$qemu_version" >>$config_mak
-echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
+echo "VERSION=$qemu_version" >>$config_host_mak
+echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_host_h
 
-echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_h
+echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_host_h
 
-echo "SRC_PATH=$source_path" >> $config_mak
+echo "SRC_PATH=$source_path" >> $config_host_mak
 if [ "$source_path_used" = "yes" ]; then
-  echo "VPATH=$source_path" >> $config_mak
+  echo "VPATH=$source_path" >> $config_host_mak
 fi
-echo "TARGET_DIRS=$target_list" >> $config_mak
+echo "TARGET_DIRS=$target_list" >> $config_host_mak
 if [ "$build_docs" = "yes" ] ; then
-  echo "BUILD_DOCS=yes" >> $config_mak
+  echo "BUILD_DOCS=yes" >> $config_host_mak
 fi
 if test "$static" = "yes"; then
   sdl1=$sdl_static
@@ -1654,109 +1655,109 @@ else
   sdl1=$sdl
 fi
 if test "$sdl1" = "yes" ; then
-  echo "#define CONFIG_SDL 1" >> $config_h
-  echo "CONFIG_SDL=y" >> $config_mak
+  echo "#define CONFIG_SDL 1" >> $config_host_h
+  echo "CONFIG_SDL=y" >> $config_host_mak
   if test "$target_softmmu" = "no" -o "$static" = "yes"; then
-    echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+    echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
   elif test "$sdl_x11" = "yes" ; then
-    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
+    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak
   else
-    echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
+    echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak
   fi
   if [ "${aa}" = "yes" ] ; then
-    echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak
+    echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_host_mak
   else
-    echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+    echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak
   fi
 fi
 if test "$cocoa" = "yes" ; then
-  echo "#define CONFIG_COCOA 1" >> $config_h
-  echo "CONFIG_COCOA=y" >> $config_mak
+  echo "#define CONFIG_COCOA 1" >> $config_host_h
+  echo "CONFIG_COCOA=y" >> $config_host_mak
 fi
 if test "$curses" = "yes" ; then
-  echo "#define CONFIG_CURSES 1" >> $config_h
-  echo "CONFIG_CURSES=y" >> $config_mak
+  echo "#define CONFIG_CURSES 1" >> $config_host_h
+  echo "CONFIG_CURSES=y" >> $config_host_mak
   if test "$ncurses" = "yes" ; then
-    echo "CURSES_LIBS=-lncurses" >> $config_mak
+    echo "CURSES_LIBS=-lncurses" >> $config_host_mak
   else
-    echo "CURSES_LIBS=-lcurses" >> $config_mak
+    echo "CURSES_LIBS=-lcurses" >> $config_host_mak
   fi
 fi
 if test "$atfile" = "yes" ; then
-  echo "#define CONFIG_ATFILE 1" >> $config_h
+  echo "#define CONFIG_ATFILE 1" >> $config_host_h
 fi
 if test "$utimens" = "yes" ; then
-  echo "#define CONFIG_UTIMENSAT 1" >> $config_h
+  echo "#define CONFIG_UTIMENSAT 1" >> $config_host_h
 fi
 if test "$pipe2" = "yes" ; then
-  echo "#define CONFIG_PIPE2 1" >> $config_h
+  echo "#define CONFIG_PIPE2 1" >> $config_host_h
 fi
 if test "$splice" = "yes" ; then
-  echo "#define CONFIG_SPLICE 1" >> $config_h
+  echo "#define CONFIG_SPLICE 1" >> $config_host_h
 fi
 if test "$inotify" = "yes" ; then
-  echo "#define CONFIG_INOTIFY 1" >> $config_h
+  echo "#define CONFIG_INOTIFY 1" >> $config_host_h
 fi
 if test "$curl" = "yes" ; then
-  echo "CONFIG_CURL=y" >> $config_mak
-  echo "CURL_LIBS=$curl_libs" >> $config_mak
-  echo "#define CONFIG_CURL 1" >> $config_h
+  echo "CONFIG_CURL=y" >> $config_host_mak
+  echo "CURL_LIBS=$curl_libs" >> $config_host_mak
+  echo "#define CONFIG_CURL 1" >> $config_host_h
 fi
 if test "$brlapi" = "yes" ; then
-  echo "CONFIG_BRLAPI=y" >> $config_mak
-  echo "#define CONFIG_BRLAPI 1" >> $config_h
-  echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
+  echo "CONFIG_BRLAPI=y" >> $config_host_mak
+  echo "#define CONFIG_BRLAPI 1" >> $config_host_h
+  echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
 fi
 if test "$bluez" = "yes" ; then
-  echo "CONFIG_BLUEZ=y" >> $config_mak
-  echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
-  echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
-  echo "#define CONFIG_BLUEZ 1" >> $config_h
+  echo "CONFIG_BLUEZ=y" >> $config_host_mak
+  echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
+  echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_host_mak
+  echo "#define CONFIG_BLUEZ 1" >> $config_host_h
 fi
 if test "$xen" = "yes" ; then
-  echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_mak
+  echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_host_mak
 fi
 if test "$aio" = "yes" ; then
-  echo "#define CONFIG_AIO 1" >> $config_h
-  echo "CONFIG_AIO=y" >> $config_mak
+  echo "#define CONFIG_AIO 1" >> $config_host_h
+  echo "CONFIG_AIO=y" >> $config_host_mak
 fi
 if test "$io_thread" = "yes" ; then
-  echo "CONFIG_IOTHREAD=y" >> $config_mak
-  echo "#define CONFIG_IOTHREAD 1" >> $config_h
+  echo "CONFIG_IOTHREAD=y" >> $config_host_mak
+  echo "#define CONFIG_IOTHREAD 1" >> $config_host_h
 fi
 if test "$blobs" = "yes" ; then
-  echo "INSTALL_BLOBS=yes" >> $config_mak
+  echo "INSTALL_BLOBS=yes" >> $config_host_mak
 fi
 if test "$iovec" = "yes" ; then
-  echo "#define HAVE_IOVEC 1" >> $config_h
+  echo "#define HAVE_IOVEC 1" >> $config_host_h
 fi
 if test "$preadv" = "yes" ; then
-  echo "#define HAVE_PREADV 1" >> $config_h
+  echo "#define HAVE_PREADV 1" >> $config_host_h
 fi
 if test "$fdt" = "yes" ; then
-  echo "#define HAVE_FDT 1" >> $config_h
-  echo "FDT_LIBS=-lfdt" >> $config_mak
+  echo "#define HAVE_FDT 1" >> $config_host_h
+  echo "FDT_LIBS=-lfdt" >> $config_host_mak
 fi
 
 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
-  echo "#define O_LARGEFILE 0" >> $config_h
-  echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
-  echo "#define HOST_BSD 1" >> $config_h
+  echo "#define O_LARGEFILE 0" >> $config_host_h
+  echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_host_h
+  echo "#define HOST_BSD 1" >> $config_host_h
 fi
 
-echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
+echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_host_h
 
 # USB host support
 case "$usb" in
 linux)
-  echo "HOST_USB=linux" >> $config_mak
+  echo "HOST_USB=linux" >> $config_host_mak
 ;;
 bsd)
-  echo "HOST_USB=bsd" >> $config_mak
+  echo "HOST_USB=bsd" >> $config_host_mak
 ;;
 *)
-  echo "HOST_USB=stub" >> $config_mak
+  echo "HOST_USB=stub" >> $config_host_mak
 ;;
 esac
 
@@ -1775,16 +1776,16 @@ int main(void) { }
 EOF
 if check_linker_flags --whole-archive --no-whole-archive ; then
     # GNU ld
-    echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_mak
-    echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_mak
+    echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_host_mak
+    echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_host_mak
 elif check_linker_flags -z,allextract -z,defaultextract ; then
     # Solaris ld
-    echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_mak
-    echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_mak
+    echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_host_mak
+    echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_host_mak
 elif check_linker_flags -all_load ; then
     # Mac OS X
-    echo "ARLIBS_BEGIN=-all_load" >> $config_mak
-    echo "ARLIBS_END=" >> $config_mak
+    echo "ARLIBS_BEGIN=-all_load" >> $config_host_mak
+    echo "ARLIBS_END=" >> $config_host_mak
 else
     echo "Error: your linker does not support --whole-archive or -z."
     echo "Please report to qemu-devel@nongnu.org"
@@ -1793,7 +1794,7 @@ fi
 
 if test "$xen" = "yes" ;
     then
-    echo "CONFIG_XEN=y" >> $config_mak
+    echo "CONFIG_XEN=y" >> $config_host_mak
 fi
 
 tools=
@@ -1803,24 +1804,22 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
       tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
   fi
 fi
-echo "TOOLS=$tools" >> $config_mak
+echo "TOOLS=$tools" >> $config_host_mak
 
 roms=
 if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then
   roms="pc-bios/optionrom"
 fi
-echo "ROMS=$roms" >> $config_mak
+echo "ROMS=$roms" >> $config_host_mak
 
-if test -f ${config_h}~ ; then
-  if cmp -s $config_h ${config_h}~ ; then
-    mv ${config_h}~ $config_h
+if test -f ${config_host_h}~ ; then
+  if cmp -s $config_host_h ${config_host_h}~ ; then
+    mv ${config_host_h}~ $config_host_h
   else
-    rm ${config_h}~
+    rm ${config_host_h}~
   fi
 fi
 
-config_host_mak=${config_mak}
-
 for target in $target_list; do
 target_dir="$target"
 config_mak=$target_dir/config.mak