[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile |
Date: |
Sun, 3 Jun 2012 14:25:46 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 6 +-----
fsdev/Makefile | 6 ++++++
2 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 fsdev/Makefile
diff --git a/Makefile.objs b/Makefile.objs
index 8433fad..383d4cc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -51,11 +51,7 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
# only pull in the actual virtio-9p device if we also enabled virtio.
CONFIG_REALLY_VIRTFS=y
-fsdev-nested-y = qemu-fsdev.o virtio-9p-marshal.o
-else
-fsdev-nested-y = qemu-fsdev-dummy.o
endif
-fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
######################################################################
# Target independent part of system emulation. The long term path is to
@@ -65,7 +61,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/,
$(fsdev-nested-y))
common-obj-y = $(block-obj-y) blockdev.o
common-obj-y += net.o net/
common-obj-y += qom/
-common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
+common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += readline.o console.o cursor.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
diff --git a/fsdev/Makefile b/fsdev/Makefile
new file mode 100644
index 0000000..7f13d86
--- /dev/null
+++ b/fsdev/Makefile
@@ -0,0 +1,6 @@
+ifeq ($(CONFIG_REALLY_VIRTFS),y)
+common-obj-y = qemu-fsdev.o virtio-9p-marshal.o
+else
+common-obj-y = qemu-fsdev-dummy.o
+endif
+
--
1.7.10.1
- [Qemu-devel] [PATCH 02/24] do not sprinkle around GENERATED_HEADERS dependencies, (continued)
- [Qemu-devel] [PATCH 02/24] do not sprinkle around GENERATED_HEADERS dependencies, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 04/24] move *-user/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 06/24] move libobj-y variable to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 05/24] move obj-TARGET-y variables to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 07/24] move other target-*/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 08/24] move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 09/24] use nested Makefile rules for qom/ objects, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 10/24] move block/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/24] move net/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 13/24] move ui/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 14/24] move audio/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 15/24] move slirp/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 18/24] move target-independent hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 19/24] convert libhw to nested Makefiles, Paolo Bonzini, 2012/06/03