From 82cb6b041c307bd96c067147af69cd98be91a682 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 19 Jan 2013 11:06:48 +0100 Subject: 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 Signed-off-by: Blue Swirl --- Makefile.objs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile.objs') diff --git a/Makefile.objs b/Makefile.objs index 63ddaaf725..68eb0cef1a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -55,7 +55,6 @@ 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 += migration.o migration-tcp.o common-obj-y += qemu-char.o #aio.o @@ -68,7 +67,6 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o common-obj-y += audio/ common-obj-y += hw/ -extra-obj-y += hw/ common-obj-y += ui/ common-obj-y += bt-host.o bt-vhci.o @@ -118,6 +116,5 @@ nested-vars += \ util-obj-y \ qga-obj-y \ block-obj-y \ - common-obj-y \ - extra-obj-y + common-obj-y dummy := $(call unnest-vars) -- cgit v1.2.1