From patchwork Wed Dec 12 13:14:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 205506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED7722C00A6 for ; Thu, 13 Dec 2012 00:11:53 +1100 (EST) Received: from localhost ([::1]:37008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim6J-0001ll-W0 for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 08:11:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim5W-0000Bc-DM for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tim5P-0002fs-04 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:11:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim5O-0002fn-N1 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:10:54 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBCDAsAu011775 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Dec 2012 08:10:54 -0500 Received: from redhat.com (vpn1-7-32.ams2.redhat.com [10.36.7.32]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id qBCDAl0c032101 for ; Wed, 12 Dec 2012 08:10:53 -0500 Date: Wed, 12 Dec 2012 15:14:00 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <475d67c3bcd6ba9fef917b6e59d96ae69eb1a9b4.1355318011.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/8] pci: prepare makefiles for pci code reorganization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To make it easier to move code around without breaking build at intermedite steps, tweak makefiles to look in pci/ and hw/ for include files, automatically. This will be reverted at the end of the reorganization. Signed-off-by: Michael S. Tsirkin --- Makefile | 1 + Makefile.target | 1 + Makefile.user | 1 + hw/pci/hw | 1 + 4 files changed, 4 insertions(+) create mode 120000 hw/pci/hw \ No newline at end of file diff --git a/Makefile b/Makefile index 9ecbcbb..b9a81d1 100644 --- a/Makefile +++ b/Makefile @@ -146,6 +146,7 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) QEMU_CFLAGS += -I$(SRC_PATH)/include +QEMU_CFLAGS+=-I$(SRC_PATH)/hw/pci -I$(SRC_PATH)/hw ui/cocoa.o: ui/cocoa.m diff --git a/Makefile.target b/Makefile.target index 8b658c0..e2e8840 100644 --- a/Makefile.target +++ b/Makefile.target @@ -12,6 +12,7 @@ endif QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H QEMU_CFLAGS+=-I$(SRC_PATH)/include +QEMU_CFLAGS+=-I$(SRC_PATH)/hw/pci -I$(SRC_PATH)/hw ifdef CONFIG_USER_ONLY # user emulator name diff --git a/Makefile.user b/Makefile.user index 9302d33..045ecd3 100644 --- a/Makefile.user +++ b/Makefile.user @@ -11,6 +11,7 @@ $(call set-vpath, $(SRC_PATH)) QEMU_CFLAGS+=-I.. QEMU_CFLAGS += -I$(SRC_PATH)/include QEMU_CFLAGS += -DCONFIG_USER_ONLY +QEMU_CFLAGS+=-I$(SRC_PATH)/hw/pci -I$(SRC_PATH)/hw include $(SRC_PATH)/Makefile.objs diff --git a/hw/pci/hw b/hw/pci/hw new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/hw/pci/hw @@ -0,0 +1 @@ +.