[LIBXC] Generic include of arch-specific sub-makefile.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 05fba845f4dc83166e0b367359219033d4fc9d32..98f5d9fdf45a8155a3008abf3719d4e40bf2b9e0 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -35,8 +35,7 @@ GUEST_SRCS-$(CONFIG_IA64) += xc_linux_build.c
 GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c
 GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
 
-# This Makefile only adds files if CONFIG_IA64 is y.
-include ia64/Makefile
+-include $(XEN_TARGET_ARCH)/Makefile
 
 CFLAGS   += -Werror
 CFLAGS   += -fno-strict-aliasing

diff --git a/tools/libxc/ia64/Makefile b/tools/libxc/ia64/Makefile
index 95c295ae1ee4123aa1ae06df348f4e20d8f20dff..974a5c382715ccce914de57dbdc3580ff06b69b5 100644 (file)
--- a/tools/libxc/ia64/Makefile
+++ b/tools/libxc/ia64/Makefile
@@ -1,5 +1,5 @@
-CTRL_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_stubs.c
+CTRL_SRCS-y += ia64/xc_ia64_stubs.c
 
-GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_hvm_build.c
-GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_linux_save.c
-GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_linux_restore.c
+GUEST_SRCS-y += ia64/xc_ia64_hvm_build.c
+GUEST_SRCS-y += ia64/xc_ia64_linux_save.c
+GUEST_SRCS-y += ia64/xc_ia64_linux_restore.c