diff options
| author | Anthony Liguori | 2012-06-07 11:21:40 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-06-07 11:21:40 +0200 |
| commit | fa79c914efd35cb60e0bc18512c03690c48b13e2 (patch) | |
| tree | f8b6d789285dc86155bfe3f907f1871d8011a1b0 /fsdev/Makefile.objs | |
| parent | target-microblaze: fix swx build breakage (diff) | |
| parent | build: do not create directories at configure time (diff) | |
| download | qemu-fa79c914efd35cb60e0bc18512c03690c48b13e2.tar.gz qemu-fa79c914efd35cb60e0bc18512c03690c48b13e2.tar.xz qemu-fa79c914efd35cb60e0bc18512c03690c48b13e2.zip | |
Merge remote-tracking branch 'bonzini/nested-makefiles-3' into staging
* bonzini/nested-makefiles-3: (29 commits)
build: do not create directories at configure time
configure: ensure directory exists when creating symlink
build: compile oslib-obj-y once
build: limit usage of vpath
build: libcacard Makefile cleanups
build: move device tree to per-target Makefile.objs
build: move per-target hw/ objects to nested Makefile.objs
build: convert libhw to nested Makefile.objs
build: move target-independent hw/ objects to nested Makefile.objs
build: move qga/ objects to nested Makefile.objs
build: move qapi/ objects to nested Makefile.objs
build: move slirp/ objects to nested Makefile.objs
build: move audio/ objects to nested Makefile.objs
build: move ui/ objects to nested Makefile.objs
build: move fsdev/ objects to nested Makefile.objs
build: move net/ objects to nested Makefile.objs
build: move block/ objects to nested Makefile.objs
build: adapt qom/Makefile and move it to Makefile.objs
build: move rules for nesting to Makefile.objs
build: move other target-*/ objects to nested Makefile.objs
...
Diffstat (limited to 'fsdev/Makefile.objs')
| -rw-r--r-- | fsdev/Makefile.objs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs new file mode 100644 index 0000000000..cb1e2500b9 --- /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 |
