aboutsummaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-19 11:06:47 +0100
committerBlue Swirl <blauwirbel@gmail.com>2013-01-26 13:15:35 +0000
commit000823449ca07e50086413338f907d7a817db2ce (patch)
treee5b0ea6435ef01e626d0babb336dbc8dd977e6ee /Makefile.target
parent737f351892e271fb3080c3c26e6453d939dd1d68 (diff)
build: remove universal-obj-y
All of universal-obj-y, user-obj-y (right now unused) and common-obj-y can be unified into common-obj-y if we take care of defining CONFIG_SOFTMMU and CONFIG_USER_ONLY in the toplevel makefile. This is similar to how we define symbols for hardware components. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index eb84b1f8e3..760da1edf6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -145,8 +145,7 @@ nested-vars += obj-y
include $(SRC_PATH)/Makefile.objs
all-obj-y = $(obj-y)
-all-obj-y += $(addprefix ../, $(universal-obj-y))
-all-obj-$(CONFIG_SOFTMMU) += $(addprefix ../, $(common-obj-y))
+all-obj-y += $(addprefix ../, $(common-obj-y))
ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable.