aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2012-12-12 14:39:01 +0200
committerMichael S. Tsirkin <mst@redhat.com>2012-12-17 13:02:27 +0200
commitd9fb58054825ef141e6d03f455654b2e3e767bce (patch)
treea4353a62e4d4acc7545e6ee9f89be17bb07e7293
parentc759b24fae08c6c333df03e1db48e13b7f5eda30 (diff)
Revert "pci: prepare makefiles for pci code reorganization"
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>
-rw-r--r--Makefile1
-rw-r--r--Makefile.target1
-rw-r--r--Makefile.user1
l---------hw/pci/hw1
4 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b9a81d18a2..9ecbcbb0a7 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 fe2cc0d8b0..927347bac2 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 045ecd3bea..9302d33245 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 945c9b46d6..0000000000
--- a/hw/pci/hw
+++ /dev/null
@@ -1 +0,0 @@
-. \ No newline at end of file