gwj / at91sam9263 · Commits

Commit 98ec69ac121d1db903a28ec735b6eeef5ed64174

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent e6e91b9c

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>
Inline Side-by-side
Showing 1 changed file with 155 additions and 156 deletions
configure
  View file @98ec69a
... ... @@ -1460,40 +1460,41 @@ fi
1460 1460 #if test "$sdl_static" = "no"; then
1461 1461 # echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
1462 1462 #fi
1463   -config_mak="config-host.mak"
1464   -config_h="config-host.h"
1465 1463  
1466   -#echo "Creating $config_mak and $config_h"
1467   -
1468   -test -f $config_h && mv $config_h ${config_h}~
1469   -
1470   -echo "# Automatically generated by configure - do not modify" > $config_mak
1471   -printf "# Configured with:" >> $config_mak
1472   -printf " '%s'" "$0" "$@" >> $config_mak
1473   -echo >> $config_mak
1474   -echo "/* Automatically generated by configure - do not modify */" > $config_h
1475   -
1476   -echo "prefix=$prefix" >> $config_mak
1477   -echo "bindir=\${prefix}$binsuffix" >> $config_mak
1478   -echo "mandir=\${prefix}$mansuffix" >> $config_mak
1479   -echo "datadir=\${prefix}$datasuffix" >> $config_mak
1480   -echo "docdir=\${prefix}$docsuffix" >> $config_mak
1481   -echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
1482   -echo "MAKE=$make" >> $config_mak
1483   -echo "INSTALL=$install" >> $config_mak
1484   -echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
1485   -echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
1486   -echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
1487   -echo "CC=$cc" >> $config_mak
1488   -echo "HOST_CC=$host_cc" >> $config_mak
1489   -echo "AR=$ar" >> $config_mak
1490   -echo "OBJCOPY=$objcopy" >> $config_mak
1491   -echo "LD=$ld" >> $config_mak
1492   -echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
1493   -echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
1494   -echo "EXESUF=$EXESUF" >> $config_mak
1495   -echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
1496   -echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak
  1464 +config_host_mak="config-host.mak"
  1465 +config_host_h="config-host.h"
  1466 +
  1467 +#echo "Creating $config_host_mak and $config_host_h"
  1468 +
  1469 +test -f $config_host_h && mv $config_host_h ${config_host_h}~
  1470 +
  1471 +echo "# Automatically generated by configure - do not modify" > $config_host_mak
  1472 +printf "# Configured with:" >> $config_host_mak
  1473 +printf " '%s'" "$0" "$@" >> $config_host_mak
  1474 +echo >> $config_host_mak
  1475 +echo "/* Automatically generated by configure - do not modify */" > $config_host_h
  1476 +
  1477 +echo "prefix=$prefix" >> $config_host_mak
  1478 +echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
  1479 +echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
  1480 +echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
  1481 +echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
  1482 +echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h
  1483 +echo "MAKE=$make" >> $config_host_mak
  1484 +echo "INSTALL=$install" >> $config_host_mak
  1485 +echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
  1486 +echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
  1487 +echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
  1488 +echo "CC=$cc" >> $config_host_mak
  1489 +echo "HOST_CC=$host_cc" >> $config_host_mak
  1490 +echo "AR=$ar" >> $config_host_mak
  1491 +echo "OBJCOPY=$objcopy" >> $config_host_mak
  1492 +echo "LD=$ld" >> $config_host_mak
  1493 +echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
  1494 +echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
  1495 +echo "EXESUF=$EXESUF" >> $config_host_mak
  1496 +echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
  1497 +echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
1497 1498 case "$cpu" in
1498 1499 i386|x86_64|alpha|cris|hppa|ia64|m68k|microbaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
1499 1500 ARCH=$cpu
... ... @@ -1506,39 +1507,39 @@ case &quot;$cpu&quot; in
1506 1507 exit 1
1507 1508 ;;
1508 1509 esac
1509   -echo "ARCH=$ARCH" >> $config_mak
  1510 +echo "ARCH=$ARCH" >> $config_host_mak
1510 1511 arch_name=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
1511   -echo "#define HOST_$arch_name 1" >> $config_h
  1512 +echo "#define HOST_$arch_name 1" >> $config_host_h
1512 1513  
1513 1514 if test "$debug_tcg" = "yes" ; then
1514   - echo "#define DEBUG_TCG 1" >> $config_h
  1515 + echo "#define DEBUG_TCG 1" >> $config_host_h
1515 1516 fi
1516 1517 if test "$debug" = "yes" ; then
1517   - echo "#define DEBUG_EXEC 1" >> $config_h
  1518 + echo "#define DEBUG_EXEC 1" >> $config_host_h
1518 1519 fi
1519 1520 if test "$sparse" = "yes" ; then
1520   - echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_mak
1521   - echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_mak
1522   - echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak
  1521 + echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
  1522 + echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
  1523 + echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
1523 1524 fi
1524 1525 if test "$strip_opt" = "yes" ; then
1525   - echo "STRIP_OPT=-s" >> $config_mak
  1526 + echo "STRIP_OPT=-s" >> $config_host_mak
1526 1527 fi
1527 1528 if test "$bigendian" = "yes" ; then
1528   - echo "WORDS_BIGENDIAN=yes" >> $config_mak
1529   - echo "#define WORDS_BIGENDIAN 1" >> $config_h
  1529 + echo "WORDS_BIGENDIAN=yes" >> $config_host_mak
  1530 + echo "#define WORDS_BIGENDIAN 1" >> $config_host_h
1530 1531 fi
1531   -echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
  1532 +echo "#define HOST_LONG_BITS $hostlongbits" >> $config_host_h
1532 1533 if test "$mingw32" = "yes" ; then
1533   - echo "CONFIG_WIN32=y" >> $config_mak
1534   - echo "#define CONFIG_WIN32 1" >> $config_h
  1534 + echo "CONFIG_WIN32=y" >> $config_host_mak
  1535 + echo "#define CONFIG_WIN32 1" >> $config_host_h
1535 1536 else
1536 1537 cat > $TMPC << EOF
1537 1538 #include <byteswap.h>
1538 1539 int main(void) { return bswap_32(0); }
1539 1540 EOF
1540 1541 if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1541   - echo "#define HAVE_BYTESWAP_H 1" >> $config_h
  1542 + echo "#define HAVE_BYTESWAP_H 1" >> $config_host_h
1542 1543 fi
1543 1544 cat > $TMPC << EOF
1544 1545 #include <sys/endian.h>
... ... @@ -1547,106 +1548,106 @@ EOF
1547 1548 int main(void) { return bswap32(0); }
1548 1549 EOF
1549 1550 if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1550   - echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
  1551 + echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_host_h
1551 1552 fi
1552 1553 fi
1553 1554  
1554 1555 if [ "$openbsd" = "yes" ] ; then
1555   - echo "#define ENOTSUP 4096" >> $config_h
  1556 + echo "#define ENOTSUP 4096" >> $config_host_h
1556 1557 fi
1557 1558  
1558 1559 if test "$darwin" = "yes" ; then
1559   - echo "CONFIG_DARWIN=y" >> $config_mak
1560   - echo "#define CONFIG_DARWIN 1" >> $config_h
  1560 + echo "CONFIG_DARWIN=y" >> $config_host_mak
  1561 + echo "#define CONFIG_DARWIN 1" >> $config_host_h
1561 1562 fi
1562 1563  
1563 1564 if test "$aix" = "yes" ; then
1564   - echo "CONFIG_AIX=y" >> $config_mak
1565   - echo "#define CONFIG_AIX 1" >> $config_h
  1565 + echo "CONFIG_AIX=y" >> $config_host_mak
  1566 + echo "#define CONFIG_AIX 1" >> $config_host_h
1566 1567 fi
1567 1568  
1568 1569 if test "$solaris" = "yes" ; then
1569   - echo "CONFIG_SOLARIS=y" >> $config_mak
1570   - echo "#define HOST_SOLARIS $solarisrev" >> $config_h
  1570 + echo "CONFIG_SOLARIS=y" >> $config_host_mak
  1571 + echo "#define HOST_SOLARIS $solarisrev" >> $config_host_h
1571 1572 if test "$needs_libsunmath" = "yes" ; then
1572   - echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
1573   - echo "#define NEEDS_LIBSUNMATH 1" >> $config_h
  1573 + echo "NEEDS_LIBSUNMATH=yes" >> $config_host_mak
  1574 + echo "#define NEEDS_LIBSUNMATH 1" >> $config_host_h
1574 1575 fi
1575 1576 fi
1576 1577 if test -n "$sparc_cpu"; then
1577   - echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak
1578   - echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
  1578 + echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_host_mak
  1579 + echo "#define __sparc_${sparc_cpu}__ 1" >> $config_host_h
1579 1580 fi
1580 1581 if test "$gprof" = "yes" ; then
1581   - echo "TARGET_GPROF=yes" >> $config_mak
1582   - echo "#define HAVE_GPROF 1" >> $config_h
  1582 + echo "TARGET_GPROF=yes" >> $config_host_mak
  1583 + echo "#define HAVE_GPROF 1" >> $config_host_h
1583 1584 fi
1584 1585 if test "$static" = "yes" ; then
1585   - echo "CONFIG_STATIC=y" >> $config_mak
1586   - echo "#define CONFIG_STATIC 1" >> $config_h
  1586 + echo "CONFIG_STATIC=y" >> $config_host_mak
  1587 + echo "#define CONFIG_STATIC 1" >> $config_host_h
1587 1588 fi
1588 1589 if test $profiler = "yes" ; then
1589   - echo "#define CONFIG_PROFILER 1" >> $config_h
  1590 + echo "#define CONFIG_PROFILER 1" >> $config_host_h
1590 1591 fi
1591 1592 if test "$slirp" = "yes" ; then
1592   - echo "CONFIG_SLIRP=y" >> $config_mak
1593   - echo "#define CONFIG_SLIRP 1" >> $config_h
  1593 + echo "CONFIG_SLIRP=y" >> $config_host_mak
  1594 + echo "#define CONFIG_SLIRP 1" >> $config_host_h
1594 1595 fi
1595 1596 if test "$vde" = "yes" ; then
1596   - echo "CONFIG_VDE=y" >> $config_mak
1597   - echo "#define CONFIG_VDE 1" >> $config_h
1598   - echo "VDE_LIBS=-lvdeplug" >> $config_mak
  1597 + echo "CONFIG_VDE=y" >> $config_host_mak
  1598 + echo "#define CONFIG_VDE 1" >> $config_host_h
  1599 + echo "VDE_LIBS=-lvdeplug" >> $config_host_mak
1599 1600 fi
1600 1601 for card in $audio_card_list; do
1601 1602 def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
1602   - echo "$def=y" >> $config_mak
1603   - echo "#define $def 1" >> $config_h
  1603 + echo "$def=y" >> $config_host_mak
  1604 + echo "#define $def 1" >> $config_host_h
1604 1605 done
1605   -echo "#define AUDIO_DRIVERS \\" >> $config_h
  1606 +echo "#define AUDIO_DRIVERS \\" >> $config_host_h
1606 1607 for drv in $audio_drv_list; do
1607   - echo " &${drv}_audio_driver, \\" >>$config_h
  1608 + echo " &${drv}_audio_driver, \\" >>$config_host_h
1608 1609 def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
1609   - echo "$def=y" >> $config_mak
  1610 + echo "$def=y" >> $config_host_mak
1610 1611 if test "$drv" = "fmod"; then
1611   - echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
1612   - echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
  1612 + echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak
  1613 + echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak
1613 1614 elif test "$drv" = "oss"; then
1614   - echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak
  1615 + echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
1615 1616 fi
1616 1617 done
1617   -echo "" >>$config_h
  1618 +echo "" >>$config_host_h
1618 1619 if test "$mixemu" = "yes" ; then
1619   - echo "CONFIG_MIXEMU=y" >> $config_mak
1620   - echo "#define CONFIG_MIXEMU 1" >> $config_h
  1620 + echo "CONFIG_MIXEMU=y" >> $config_host_mak
  1621 + echo "#define CONFIG_MIXEMU 1" >> $config_host_h
1621 1622 fi
1622 1623 if test "$vnc_tls" = "yes" ; then
1623   - echo "CONFIG_VNC_TLS=y" >> $config_mak
1624   - echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
1625   - echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
1626   - echo "#define CONFIG_VNC_TLS 1" >> $config_h
  1624 + echo "CONFIG_VNC_TLS=y" >> $config_host_mak
  1625 + echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
  1626 + echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
  1627 + echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
1627 1628 fi
1628 1629 if test "$vnc_sasl" = "yes" ; then
1629   - echo "CONFIG_VNC_SASL=y" >> $config_mak
1630   - echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
1631   - echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
1632   - echo "#define CONFIG_VNC_SASL 1" >> $config_h
  1630 + echo "CONFIG_VNC_SASL=y" >> $config_host_mak
  1631 + echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
  1632 + echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
  1633 + echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
1633 1634 fi
1634 1635 if test "$fnmatch" = "yes" ; then
1635   - echo "#define HAVE_FNMATCH_H 1" >> $config_h
  1636 + echo "#define HAVE_FNMATCH_H 1" >> $config_host_h
1636 1637 fi
1637 1638 qemu_version=`head $source_path/VERSION`
1638   -echo "VERSION=$qemu_version" >>$config_mak
1639   -echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
  1639 +echo "VERSION=$qemu_version" >>$config_host_mak
  1640 +echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_host_h
1640 1641  
1641   -echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_h
  1642 +echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_host_h
1642 1643  
1643   -echo "SRC_PATH=$source_path" >> $config_mak
  1644 +echo "SRC_PATH=$source_path" >> $config_host_mak
1644 1645 if [ "$source_path_used" = "yes" ]; then
1645   - echo "VPATH=$source_path" >> $config_mak
  1646 + echo "VPATH=$source_path" >> $config_host_mak
1646 1647 fi
1647   -echo "TARGET_DIRS=$target_list" >> $config_mak
  1648 +echo "TARGET_DIRS=$target_list" >> $config_host_mak
1648 1649 if [ "$build_docs" = "yes" ] ; then
1649   - echo "BUILD_DOCS=yes" >> $config_mak
  1650 + echo "BUILD_DOCS=yes" >> $config_host_mak
1650 1651 fi
1651 1652 if test "$static" = "yes"; then
1652 1653 sdl1=$sdl_static
... ... @@ -1654,109 +1655,109 @@ else
1654 1655 sdl1=$sdl
1655 1656 fi
1656 1657 if test "$sdl1" = "yes" ; then
1657   - echo "#define CONFIG_SDL 1" >> $config_h
1658   - echo "CONFIG_SDL=y" >> $config_mak
  1658 + echo "#define CONFIG_SDL 1" >> $config_host_h
  1659 + echo "CONFIG_SDL=y" >> $config_host_mak
1659 1660 if test "$target_softmmu" = "no" -o "$static" = "yes"; then
1660   - echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
  1661 + echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
1661 1662 elif test "$sdl_x11" = "yes" ; then
1662   - echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
  1663 + echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak
1663 1664 else
1664   - echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
  1665 + echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak
1665 1666 fi
1666 1667 if [ "${aa}" = "yes" ] ; then
1667   - echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak
  1668 + echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_host_mak
1668 1669 else
1669   - echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
  1670 + echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak
1670 1671 fi
1671 1672 fi
1672 1673 if test "$cocoa" = "yes" ; then
1673   - echo "#define CONFIG_COCOA 1" >> $config_h
1674   - echo "CONFIG_COCOA=y" >> $config_mak
  1674 + echo "#define CONFIG_COCOA 1" >> $config_host_h
  1675 + echo "CONFIG_COCOA=y" >> $config_host_mak
1675 1676 fi
1676 1677 if test "$curses" = "yes" ; then
1677   - echo "#define CONFIG_CURSES 1" >> $config_h
1678   - echo "CONFIG_CURSES=y" >> $config_mak
  1678 + echo "#define CONFIG_CURSES 1" >> $config_host_h
  1679 + echo "CONFIG_CURSES=y" >> $config_host_mak
1679 1680 if test "$ncurses" = "yes" ; then
1680   - echo "CURSES_LIBS=-lncurses" >> $config_mak
  1681 + echo "CURSES_LIBS=-lncurses" >> $config_host_mak
1681 1682 else
1682   - echo "CURSES_LIBS=-lcurses" >> $config_mak
  1683 + echo "CURSES_LIBS=-lcurses" >> $config_host_mak
1683 1684 fi
1684 1685 fi
1685 1686 if test "$atfile" = "yes" ; then
1686   - echo "#define CONFIG_ATFILE 1" >> $config_h
  1687 + echo "#define CONFIG_ATFILE 1" >> $config_host_h
1687 1688 fi
1688 1689 if test "$utimens" = "yes" ; then
1689   - echo "#define CONFIG_UTIMENSAT 1" >> $config_h
  1690 + echo "#define CONFIG_UTIMENSAT 1" >> $config_host_h
1690 1691 fi
1691 1692 if test "$pipe2" = "yes" ; then
1692   - echo "#define CONFIG_PIPE2 1" >> $config_h
  1693 + echo "#define CONFIG_PIPE2 1" >> $config_host_h
1693 1694 fi
1694 1695 if test "$splice" = "yes" ; then
1695   - echo "#define CONFIG_SPLICE 1" >> $config_h
  1696 + echo "#define CONFIG_SPLICE 1" >> $config_host_h
1696 1697 fi
1697 1698 if test "$inotify" = "yes" ; then
1698   - echo "#define CONFIG_INOTIFY 1" >> $config_h
  1699 + echo "#define CONFIG_INOTIFY 1" >> $config_host_h
1699 1700 fi
1700 1701 if test "$curl" = "yes" ; then
1701   - echo "CONFIG_CURL=y" >> $config_mak
1702   - echo "CURL_LIBS=$curl_libs" >> $config_mak
1703   - echo "#define CONFIG_CURL 1" >> $config_h
  1702 + echo "CONFIG_CURL=y" >> $config_host_mak
  1703 + echo "CURL_LIBS=$curl_libs" >> $config_host_mak
  1704 + echo "#define CONFIG_CURL 1" >> $config_host_h
1704 1705 fi
1705 1706 if test "$brlapi" = "yes" ; then
1706   - echo "CONFIG_BRLAPI=y" >> $config_mak
1707   - echo "#define CONFIG_BRLAPI 1" >> $config_h
1708   - echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
  1707 + echo "CONFIG_BRLAPI=y" >> $config_host_mak
  1708 + echo "#define CONFIG_BRLAPI 1" >> $config_host_h
  1709 + echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
1709 1710 fi
1710 1711 if test "$bluez" = "yes" ; then
1711   - echo "CONFIG_BLUEZ=y" >> $config_mak
1712   - echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
1713   - echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
1714   - echo "#define CONFIG_BLUEZ 1" >> $config_h
  1712 + echo "CONFIG_BLUEZ=y" >> $config_host_mak
  1713 + echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
  1714 + echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_host_mak
  1715 + echo "#define CONFIG_BLUEZ 1" >> $config_host_h
1715 1716 fi
1716 1717 if test "$xen" = "yes" ; then
1717   - echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_mak
  1718 + echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_host_mak
1718 1719 fi
1719 1720 if test "$aio" = "yes" ; then
1720   - echo "#define CONFIG_AIO 1" >> $config_h
1721   - echo "CONFIG_AIO=y" >> $config_mak
  1721 + echo "#define CONFIG_AIO 1" >> $config_host_h
  1722 + echo "CONFIG_AIO=y" >> $config_host_mak
1722 1723 fi
1723 1724 if test "$io_thread" = "yes" ; then
1724   - echo "CONFIG_IOTHREAD=y" >> $config_mak
1725   - echo "#define CONFIG_IOTHREAD 1" >> $config_h
  1725 + echo "CONFIG_IOTHREAD=y" >> $config_host_mak
  1726 + echo "#define CONFIG_IOTHREAD 1" >> $config_host_h
1726 1727 fi
1727 1728 if test "$blobs" = "yes" ; then
1728   - echo "INSTALL_BLOBS=yes" >> $config_mak
  1729 + echo "INSTALL_BLOBS=yes" >> $config_host_mak
1729 1730 fi
1730 1731 if test "$iovec" = "yes" ; then
1731   - echo "#define HAVE_IOVEC 1" >> $config_h
  1732 + echo "#define HAVE_IOVEC 1" >> $config_host_h
1732 1733 fi
1733 1734 if test "$preadv" = "yes" ; then
1734   - echo "#define HAVE_PREADV 1" >> $config_h
  1735 + echo "#define HAVE_PREADV 1" >> $config_host_h
1735 1736 fi
1736 1737 if test "$fdt" = "yes" ; then
1737   - echo "#define HAVE_FDT 1" >> $config_h
1738   - echo "FDT_LIBS=-lfdt" >> $config_mak
  1738 + echo "#define HAVE_FDT 1" >> $config_host_h
  1739 + echo "FDT_LIBS=-lfdt" >> $config_host_mak
1739 1740 fi
1740 1741  
1741 1742 # XXX: suppress that
1742 1743 if [ "$bsd" = "yes" ] ; then
1743   - echo "#define O_LARGEFILE 0" >> $config_h
1744   - echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
1745   - echo "#define HOST_BSD 1" >> $config_h
  1744 + echo "#define O_LARGEFILE 0" >> $config_host_h
  1745 + echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_host_h
  1746 + echo "#define HOST_BSD 1" >> $config_host_h
1746 1747 fi
1747 1748  
1748   -echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
  1749 +echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_host_h
1749 1750  
1750 1751 # USB host support
1751 1752 case "$usb" in
1752 1753 linux)
1753   - echo "HOST_USB=linux" >> $config_mak
  1754 + echo "HOST_USB=linux" >> $config_host_mak
1754 1755 ;;
1755 1756 bsd)
1756   - echo "HOST_USB=bsd" >> $config_mak
  1757 + echo "HOST_USB=bsd" >> $config_host_mak
1757 1758 ;;
1758 1759 *)
1759   - echo "HOST_USB=stub" >> $config_mak
  1760 + echo "HOST_USB=stub" >> $config_host_mak
1760 1761 ;;
1761 1762 esac
1762 1763  
... ... @@ -1775,16 +1776,16 @@ int main(void) { }
1775 1776 EOF
1776 1777 if check_linker_flags --whole-archive --no-whole-archive ; then
1777 1778 # GNU ld
1778   - echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_mak
1779   - echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_mak
  1779 + echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_host_mak
  1780 + echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_host_mak
1780 1781 elif check_linker_flags -z,allextract -z,defaultextract ; then
1781 1782 # Solaris ld
1782   - echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_mak
1783   - echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_mak
  1783 + echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_host_mak
  1784 + echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_host_mak
1784 1785 elif check_linker_flags -all_load ; then
1785 1786 # Mac OS X
1786   - echo "ARLIBS_BEGIN=-all_load" >> $config_mak
1787   - echo "ARLIBS_END=" >> $config_mak
  1787 + echo "ARLIBS_BEGIN=-all_load" >> $config_host_mak
  1788 + echo "ARLIBS_END=" >> $config_host_mak
1788 1789 else
1789 1790 echo "Error: your linker does not support --whole-archive or -z."
1790 1791 echo "Please report to qemu-devel@nongnu.org"
... ... @@ -1793,7 +1794,7 @@ fi
1793 1794  
1794 1795 if test "$xen" = "yes" ;
1795 1796 then
1796   - echo "CONFIG_XEN=y" >> $config_mak
  1797 + echo "CONFIG_XEN=y" >> $config_host_mak
1797 1798 fi
1798 1799  
1799 1800 tools=
... ... @@ -1803,24 +1804,22 @@ if test `expr &quot;$target_list&quot; : &quot;.*softmmu.*&quot;` != 0 ; then
1803 1804 tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
1804 1805 fi
1805 1806 fi
1806   -echo "TOOLS=$tools" >> $config_mak
  1807 +echo "TOOLS=$tools" >> $config_host_mak
1807 1808  
1808 1809 roms=
1809 1810 if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then
1810 1811 roms="pc-bios/optionrom"
1811 1812 fi
1812   -echo "ROMS=$roms" >> $config_mak
  1813 +echo "ROMS=$roms" >> $config_host_mak
1813 1814  
1814   -if test -f ${config_h}~ ; then
1815   - if cmp -s $config_h ${config_h}~ ; then
1816   - mv ${config_h}~ $config_h
  1815 +if test -f ${config_host_h}~ ; then
  1816 + if cmp -s $config_host_h ${config_host_h}~ ; then
  1817 + mv ${config_host_h}~ $config_host_h
1817 1818 else
1818   - rm ${config_h}~
  1819 + rm ${config_host_h}~
1819 1820 fi
1820 1821 fi
1821 1822  
1822   -config_host_mak=${config_mak}
1823   -
1824 1823 for target in $target_list; do
1825 1824 target_dir="$target"
1826 1825 config_mak=$target_dir/config.mak
... ...