Christian Ehrhardt wrote: > This includes the comments from Jerone. Moving the targets back into the > Makefile e.g. easen things for people looking at the Makefile for the first > time and looking for targets. So here v2 of the patch. > changes to v1: > - defining per arch targets via variables in config-$arch > - removed that user is not build for ppc assuming Hollis patches > are accepted sometime soon > > --- > > Subject: [PATCH] portability: add top level config-$arch files v2 > From: Christian Ehrhardt <[EMAIL PROTECTED]> > > This allows per arch configuration for the top level Makefile of > kvm-userspace e.g. allowing to disable extboot for non x86 or disabling > kvmctl build until ported to an architecture. > I'm aware that we now have already 8 config-$arch files in kvm-userspace > and this patch adds 4 more so maybe we need some kind of consolidation in > the future - comments and approaches to that are very welcome. > > Signed-off-by: Christian Ehrhardt <[EMAIL PROTECTED]> > > Makefile | 5 +++-- > b/config-i386.mak | 2 ++ > b/config-ia64.mak | 2 ++ > b/config-powerpc.mak | 3 +++ > b/config-x86_64.mak | 2 ++ > 5 files changed, 12 insertions(+), 2 deletions(-) > > diff -r d21fce8a6cd9 Makefile > --- a/Makefile Wed Jan 09 10:49:03 2008 +0100 > +++ b/Makefile Wed Jan 09 12:33:26 2008 +0100 > @@ -1,5 +1,6 @@ > > include config.mak > +include config-$(ARCH).mak > > DESTDIR= > > @@ -7,14 +8,14 @@ rpmrelease = devel > > .PHONY: kernel user libkvm qemu bios vgabios extboot clean > > -all: $(if $(WANT_MODULE), kernel) user libkvm qemu > +all: $(ARCH_ALL_DEP) >
Only kernel and user may vary; we always need libkvm and qemu. This might also be simplified to: all: libkvm qemu ifneq '$(filter $(ARCH), x86_64 i386 ia64)' '' all: $(if $(WANT_MODULE), kernel) user endif > > kcmd = $(if $(WANT_MODULE),,@\#) > > qemu kernel user libkvm: > $(MAKE) -C $@ > > -qemu: libkvm extboot > +qemu: $(ARCH_QEMU_DEP) > Similarly, qemu always requires libkvm, so: qemu: libkvm ifneq '$(filter $(ARCH), i386 x86_64)' '' qemu: extboot endif -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel