pci: prepare makefiles for pci code reorganization

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 <mst@redhat.com>

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