diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-20 15:24:49 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-12 18:42:50 +0100 |
| commit | 9444e9e640d56039253d885ba88c3fa818a00149 (patch) | |
| tree | 4f4b3d05b453a2291f9174c9fe18c85850e44c0f /Makefile.target | |
| parent | a372823a14461c454feaa86373bd672fd518847a (diff) | |
| download | qemu-9444e9e640d56039253d885ba88c3fa818a00149.zip qemu-9444e9e640d56039253d885ba88c3fa818a00149.tar.gz qemu-9444e9e640d56039253d885ba88c3fa818a00149.tar.bz2 | |
build: consolidate multiple variables into universal-obj-y
The directory descent mechanism, and a less-flat tree both helped
in making some *-obj-y definitions very short. Many of these
often end up in universal-obj-y, and used to be separate only
because of libuser (which is now part of history...).
Consolidate these variables in a single one.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index 0a12873..d55134c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -146,12 +146,7 @@ include $(SRC_PATH)/Makefile.objs all-obj-y = $(obj-y) all-obj-y += $(addprefix ../, $(universal-obj-y)) - -ifdef CONFIG_SOFTMMU -all-obj-y += $(addprefix ../, $(common-obj-y)) -else -all-obj-y += $(addprefix ../, $(user-obj-y)) -endif #CONFIG_LINUX_USER +all-obj-$(CONFIG_SOFTMMU) += $(addprefix ../, $(common-obj-y)) ifdef QEMU_PROGW # The linker builds a windows executable. Make also a console executable. |