[PATCH] portability: configure top level dependencies per architecture

[PATCH] portability: configure top level dependencies per architecture

[Christian Ehrhardt]

This includes the comments from Avi to "[PATCH] portability: add top level
config-$arch files v2". Putting the arch dependencies into if's saves us 4
config-$arch files which are not essential to fix the current issue.
Since this is copy&paste from Avis response to v2 I added him to the From list

changes to v2:
 - remove config-$arch files 
 - put arch dep in if's checking the arch to add more dependencies to a
   target directly in the top level Makefile

---

Subject: [PATCH] portability: configure top level dependencies per architecture 
From: Christian Ehrhardt <ehrhardt-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
From: Avi Kivity avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org

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.

Signed-off-by: Christian Ehrhardt <ehrhardt-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>

 Makefile |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,20 @@ rpmrelease = devel
 
 .PHONY: kernel user libkvm qemu bios vgabios extboot clean
 
-all: $(if $(WANT_MODULE), kernel) user libkvm qemu
+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: libkvm
+ifneq '$(filter $(ARCH), i386 x86_64)' ''
+    qemu: extboot
+endif
 user: libkvm
 
 bios:

-------------------------------------------------------------------------
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

Re: [PATCH] portability: configure top level dependencies per architecture

[Avi Kivity]

Christian Ehrhardt wrote:
> This includes the comments from Avi to "[PATCH] portability: add top level
> config-$arch files v2". Putting the arch dependencies into if's saves us 4
> config-$arch files which are not essential to fix the current issue.
> Since this is copy&paste from Avis response to v2 I added him to the From list
>
> changes to v2:
>  - remove config-$arch files 
>  - put arch dep in if's checking the arch to add more dependencies to a
>    target directly in the top level Makefile
>
>   

Applied, thanks.

-- 
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