summaryrefslogtreecommitdiff
path: root/fsdev
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-19 11:06:48 +0100
committerBlue Swirl <blauwirbel@gmail.com>2013-01-26 13:15:37 +0000
commit82cb6b041c307bd96c067147af69cd98be91a682 (patch)
tree7283ae0244b7adb22e966c3486a533e3c0e95156 /fsdev
parent000823449ca07e50086413338f907d7a817db2ce (diff)
build: remove extra-obj-y
extra-obj-y is somewhat complicated to understand. Replace it with a special CONFIG_ALL symbol that is defined only at toplevel. This limits the case of directories defining more than one *-obj-y target. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'fsdev')
-rw-r--r--fsdev/Makefile.objs8
1 files changed, 4 insertions, 4 deletions
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
index ee16ca600c..206289c49f 100644
--- a/fsdev/Makefile.objs
+++ b/fsdev/Makefile.objs
@@ -1,10 +1,10 @@
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
common-obj-y += qemu-fsdev-opts.o
+
+# Toplevel always builds this; targets without virtio will put it in
+# common-obj-y
+common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o