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>

diff --git a/Makefile b/Makefile
index b9a81d18a2f93a94f3dfac49745dffe11d9a63f7..9ecbcbb0a7cd83f1b2139082e7788bd73e997c8f 100644 (file)
--- 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 fe2cc0d8b0f023e7b74a010774ed1d68a57c9c42..927347bac2802cb1de1dfbff64792d90e72ce31a 100644 (file)
--- 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 045ecd3bea7d82c7a895234dc6b5262ac43dfac8..9302d33245a495bdb70e1d20da598d7803923d42 100644 (file)
--- 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 (symlink)
index 945c9b4..0000000
--- a/hw/pci/hw
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file