From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqZwA-0002G8-F8
	for qemu-devel@nongnu.org; Wed, 14 Jun 2006 14:17:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqZw9-0002F5-Eg
	for qemu-devel@nongnu.org; Wed, 14 Jun 2006 14:17:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqZw8-0002Em-P2
	for qemu-devel@nongnu.org; Wed, 14 Jun 2006 14:17:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqa5L-0002QO-EG
	for qemu-devel@nongnu.org; Wed, 14 Jun 2006 14:27:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqZw3-0003cR-00
	for <qemu-devel@nongnu.org>; Wed, 14 Jun 2006 14:17:47 -0400
Received: from bellard by savannah.gnu.org with local (Exim 4.50)
	id 1FqZw2-0003cO-Ul
	for qemu-devel@nongnu.org; Wed, 14 Jun 2006 18:17:47 +0000
Message-Id: <E1FqZw2-0003cO-Ul@savannah.gnu.org>
From: Fabrice Bellard <fabrice@bellard.org>
Date: Wed, 14 Jun 2006 18:17:46 +0000
Subject: [Qemu-devel] qemu configure Makefile.target
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/06/14 18:17:46

Modified files:
	.              : configure Makefile.target 

Log message:
	allow ACPI table build

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/configure?cvsroot=qemu&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/qemu/Makefile.target?cvsroot=qemu&r1=1.115&r2=1.116

Patches:
Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- configure	14 Jun 2006 15:21:14 -0000	1.105
+++ configure	14 Jun 2006 18:17:46 -0000	1.106
@@ -95,6 +95,7 @@
 softmmu="yes"
 user="no"
 build_docs="no"
+build_acpi_tables="no"
 uname_release=""
 
 # OS specific
@@ -240,6 +241,8 @@
   ;;
   --enable-uname-release=*) uname_release="$optarg"
   ;;
+  --enable-iasl) build_acpi_tables="yes"
+  ;;
   esac
 done
 
@@ -288,6 +291,7 @@
 echo "  --fmod-lib               path to FMOD library"
 echo "  --fmod-inc               path to FMOD includes"
 echo "  --enable-uname-release=R Return R for uname -r in usermode emulation"
+echo "  --enable-iasl            compilation of ACPI tables with the IASL compiler"
 echo ""
 echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
@@ -708,6 +712,9 @@
 if [ "$build_docs" = "yes" ] ; then
   echo "BUILD_DOCS=yes" >> $config_mak
 fi
+if [ "$build_acpi_tables" = "yes" ] ; then
+  echo "BUILD_ACPI_TABLES=yes" >> $config_mak
+fi
 
 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then

Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- Makefile.target	14 Jun 2006 17:32:25 -0000	1.115
+++ Makefile.target	14 Jun 2006 18:17:46 -0000	1.116
@@ -490,8 +490,10 @@
 
 acpi.o: acpi.c acpi-dsdt.hex
 
-#$(SRC_PATH)/hw/acpi-dsdt.hex: acpi-dsdt.dsl
-#	iasl -tc -p $@ $<
+ifdef BUILD_ACPI_TABLES
+$(SRC_PATH)/hw/acpi-dsdt.hex: acpi-dsdt.dsl
+	iasl -tc -p $@ $<
+endif
 
 ifeq ($(TARGET_ARCH), sh4)
 op.o: op.c op_mem.c cpu.h