[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makef
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makefile.objs |
Date: |
Thu, 7 Jun 2012 09:40:00 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 2 +-
Makefile.objs | 11 +++++------
fsdev/Makefile.objs | 9 +++++++++
3 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 fsdev/Makefile.objs
diff --git a/Makefile b/Makefile
index c0ab97a..0c0540d 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ endif
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
-$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y)
$(common-obj-y) subdir-libdis
+$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y)
$(common-obj-y) $(extra-obj-y) subdir-libdis
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y)
subdir-libdis-user subdir-libuser
diff --git a/Makefile.objs b/Makefile.objs
index f40be38..4acdbaa 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,12 +61,14 @@ 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-y += readline.o console.o cursor.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
+common-obj-$(CONFIG_LINUX) += fsdev/
+extra-obj-$(CONFIG_LINUX) += fsdev/
+
common-obj-y += tcg-runtime.o host-utils.o main-loop.o
common-obj-y += irq.o input.o
common-obj-$(CONFIG_PTIMER) += ptimer.o
@@ -442,5 +440,6 @@ nested-vars += \
block-obj-y \
qom-obj-y \
user-obj-y \
- common-obj-y
+ common-obj-y \
+ extra-obj-y
dummy := $(call unnest-vars)
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
new file mode 100644
index 0000000..cb1e250
--- /dev/null
+++ b/fsdev/Makefile.objs
@@ -0,0 +1,9 @@
+ifeq ($(CONFIG_REALLY_VIRTFS),y)
+common-obj-y = qemu-fsdev.o virtio-9p-marshal.o
+
+# Toplevel always builds this; targets without virtio will put it in
+# common-obj-y
+extra-obj-y = qemu-fsdev-dummy.o
+else
+common-obj-y = qemu-fsdev-dummy.o
+endif
--
1.7.10.1
- [Qemu-devel] [PATCH v3 10/29] build: move other target-*/ objects to nested Makefile.objs, (continued)
- [Qemu-devel] [PATCH v3 10/29] build: move other target-*/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 11/29] build: move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 13/29] build: move block/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 12/29] build: adapt qom/Makefile and move it to Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 14/29] build: move net/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 21/29] build: move target-independent hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 25/29] build: libcacard Makefile cleanups, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 26/29] build: limit usage of vpath, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 28/29] configure: ensure directory exists when creating symlink, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makefile.objs,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 07/29] dump: do not compile dump.o for user-mode emulation, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 29/29] build: do not create directories at configure time, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 09/29] dump: remove dumping stuff from cpu-all.h, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 23/29] build: move per-target hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 20/29] build: move qga/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 27/29] build: compile oslib-obj-y once, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 08/29] dump: change cpu_get_note_size to return ssize_t, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 16/29] build: move ui/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 24/29] build: move device tree to per-target Makefile.objs, Paolo Bonzini, 2012/06/07