From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 6/8] Revert "pci: prepare makefiles for pci code reorganization"
Date: Wed, 12 Dec 2012 15:14:27 +0200 [thread overview]
Message-ID: <8d60efd7cfa642f46ab401dd793f52019e7283e5.1355318011.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1355318011.git.mst@redhat.com>
This reverts commit 475d67c3bcd6ba9fef917b6e59d96ae69eb1a9b4.
Now that all users have been updated, we don't need the
makefile hack or the softlink anymore.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Makefile | 1 -
Makefile.target | 1 -
Makefile.user | 1 -
hw/pci/hw | 1 -
4 files changed, 4 deletions(-)
delete mode 120000 hw/pci/hw
diff --git a/Makefile b/Makefile
index b9a81d1..9ecbcbb 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,6 @@ 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 e2e8840..8b658c0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -12,7 +12,6 @@ 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 045ecd3..9302d33 100644
--- a/Makefile.user
+++ b/Makefile.user
@@ -11,7 +11,6 @@ $(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
deleted file mode 120000
index 945c9b4..0000000
--- a/hw/pci/hw
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
--
MST
next prev parent reply other threads:[~2012-12-12 13:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 13:13 [Qemu-devel] [PATCH 0/8] pci core reorg Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 1/8] pci: prepare makefiles for pci code reorganization Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 2/8] MAINTAINERS: add hw/pci/ to list of PCI files Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 3/8] pci: move pci core code to hw/pci Michael S. Tsirkin
2012-12-12 19:53 ` Blue Swirl
2012-12-12 20:56 ` Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 4/8] pci: update all users to look in pci/ Michael S. Tsirkin
2012-12-12 13:14 ` Michael S. Tsirkin [this message]
2012-12-12 13:14 ` [Qemu-devel] [PATCH 5/8] pci: make external dependencies explicit Michael S. Tsirkin
2012-12-12 19:49 ` Blue Swirl
2012-12-12 20:53 ` Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 7/8] pci: rename pci_internals.h pci_bus.h Michael S. Tsirkin
2012-12-12 19:56 ` Blue Swirl
2012-12-12 20:59 ` Michael S. Tsirkin
2012-12-12 13:14 ` [Qemu-devel] [PATCH 8/8] pci_bus: update comment Michael S. Tsirkin
2012-12-12 13:51 ` [Qemu-devel] [PATCH 0/8] pci core reorg Anthony Liguori
2012-12-12 13:59 ` Paolo Bonzini
2012-12-12 20:00 ` Blue Swirl
2012-12-12 20:58 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d60efd7cfa642f46ab401dd793f52019e7283e5.1355318011.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).