[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] Revert "pci: prepare makefiles for pci code reo
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 6/8] Revert "pci: prepare makefiles for pci code reorganization" |
Date: |
Wed, 12 Dec 2012 15:14:27 +0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/8] pci core reorg, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 2/8] MAINTAINERS: add hw/pci/ to list of PCI files, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 1/8] pci: prepare makefiles for pci code reorganization, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 6/8] Revert "pci: prepare makefiles for pci code reorganization",
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 4/8] pci: update all users to look in pci/, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 8/8] pci_bus: update comment, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 5/8] pci: make external dependencies explicit, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 7/8] pci: rename pci_internals.h pci_bus.h, Michael S. Tsirkin, 2012/12/12
- [Qemu-devel] [PATCH 3/8] pci: move pci core code to hw/pci, Michael S. Tsirkin, 2012/12/12