On 06/15/10 14:04, Avi Kivity wrote: > It's the other way round. Upstream keeps moving stuff out of > Makefile.target, and I move them back during merges, because the only > thing I can think of during a merge is "how quickly can I complete this > merge". > > Thanks for tackling this.
I see. I found at least some of the cases I was tackling was because things had moved from .objs to .target because of the TARGET_I386 checks. Trying to use TARGET_I386 in a file that is listed in Makefile.objs causes nasty warnings. I would very much like it if we can be more strict not allowing such changes without a very strong reason in the future :) Part of the problem is of course that there are no easy ways to check for the presence of say HPET since we don't have CONFIG_HPET so TARGET_I386 becomes the easy way :( Cheers, Jes