Am 19.01.2013 11:06, schrieb Paolo Bonzini: > This small series makes some more simplifications to Makefile.objs, > removing two more variables: universal-obj-y and extra-obj-y, all > unified into common-obj-y. It also removes what remains of user-obj-y, > unifying that into common-obj-y as well. > > To achieve this, the CONFIG_SOFTMMU and CONFIG_USER_ONLY symbols are > defined in the toplevel Makefile like we do with devices and disassemblers. > Another symbol, CONFIG_ALL, is defined only in the toplevel Makefile > and takes the place of extra-obj-y. > > With this change the structure of Makefile.objs is finally reduced to only > six recursive variables (stub-obj-y, util-obj-y, qga-obj-y, block-obj-y, > common-obj-y, obj-y). More important, the simpler structure should help > people modifying the build system, avoiding future proliferation of > variables as well. > > The patches are mostly mechanical substitutions, and there is no > user-visible change---neither in total build time, nor in the files that > are linked into the executables.
Without having tested this yet I want to remind that it is necessary for qom/cpu.c to be built twice, to not run into similar issues like util/oslib-posix.c. Andreas > > Please apply, thanks! > > Paolo > > > Paolo Bonzini (4): > build: move around libcacard-y definition > build: use -$(CONFIG_SECCOMP) instead of ifeq > build: remove universal-obj-y > build: remove extra-obj-y > > Makefile | 9 ++++----- > Makefile.objs | 43 ++++++++++++++++++------------------------- > Makefile.target | 3 +-- > disas/Makefile.objs | 30 +++++++++++++++--------------- > fsdev/Makefile.objs | 8 ++++---- > hw/Makefile.objs | 10 +++++----- > hw/pci/Makefile.objs | 2 +- > qom/Makefile.objs | 4 ++-- > 8 files changed, 50 insertions(+), 59 deletions(-) > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
