From patchwork Mon May 24 15:18:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 53430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A930DB7D2E for ; Tue, 25 May 2010 01:22:03 +1000 (EST) Received: from localhost ([127.0.0.1]:54583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGZTb-0007LO-Qj for incoming@patchwork.ozlabs.org; Mon, 24 May 2010 11:22:00 -0400 Received: from [140.186.70.92] (port=41616 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGZQE-0005sy-3j for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGZQA-0008Vf-UP for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56630) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGZQA-0008VX-IE for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:26 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4OFIPc4019552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 May 2010 11:18:25 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4OFIMLu009416; Mon, 24 May 2010 11:18:24 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 May 2010 17:18:16 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/6] Create again config-device.h and config.devices.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This were disabled in (it is reverted by hand because lot of code has changed since then). commit a992fe3d0fc185112677286f7a02204d8245b61e Author: Paul Brook Date: Sun Nov 22 16:25:30 2009 +0000 Makefile dependencies for device configs Signed-off-by: Juan Quintela --- Makefile | 7 +++++-- Makefile.target | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7986bf6..2501154 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for QEMU. -GENERATED_HEADERS = config-host.h +GENERATED_HEADERS = config-host.h config-all-devices.h ifneq ($(wildcard config-host.mak),) # Put the all: rule here so that config-host.mak can contain dependencies. @@ -70,6 +70,9 @@ build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak +config-all-devices.h: config-all-devices.h-timestamp +config-all-devices.h-timestamp: config-all-devices.mak + SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) subdir-%: $(GENERATED_HEADERS) @@ -164,7 +167,7 @@ clean: distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi - rm -f config-all-devices.mak + rm -f config-all-devices.mak config-all-devices.h* rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pdf,pg,toc,tp,vr} for d in $(TARGET_DIRS) libhw32 libhw64 libuser libdis libdis-user; do \ diff --git a/Makefile.target b/Makefile.target index fda5bf3..3859dd5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,6 +1,6 @@ # -*- Mode: makefile -*- -GENERATED_HEADERS = config-target.h +GENERATED_HEADERS = config-target.h config-devices.h CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) include ../config-host.mak @@ -38,6 +38,9 @@ kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS) config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak +config-devices.h: config-devices.h-timestamp +config-devices.h-timestamp: config-devices.mak + all: $(PROGS) # Dummy command so that make thinks it has done something