# HG changeset patch
# User Bastian Blank <waldi@debian.org>
# Date 1201284962 -3600
# Node ID 11b2e8baa6bf93b8ec4b3b4fe0256d2ce34f2699
# Parent 31adb5c972d03e45cb746cd2305126ea2571282f
Use VPATH instead of symlinks for libelf inclusion into libxenctrl.
Signed-off-by: Bastian Blank <waldi@debian.org>
diff -r 31adb5c972d0 -r 11b2e8baa6bf tools/libxc/Makefile
--- a/tools/libxc/Makefile Thu Jan 24 14:41:26 2008 +0000
+++ b/tools/libxc/Makefile Fri Jan 25 19:16:02 2008 +0100
@@ -31,20 +31,11 @@ GUEST_SRCS-$(CONFIG_MIGRATE) += xc_domai
GUEST_SRCS-$(CONFIG_MIGRATE) += xc_domain_restore.c xc_domain_save.c
GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
-# symlink libelf from xen/common/libelf/
-LIBELF_SRCS := libelf-tools.c libelf-loader.c
-LIBELF_SRCS += libelf-dominfo.c libelf-relocate.c
+VPATH = ../../xen/common/libelf
+CFLAGS += -I../../xen/common/libelf
-libelf-tools.o: libelf-tools.c libelf-private.h
-libelf-loader.o: libelf-loader.c libelf-private.h
-libelf-dominfo.o: libelf-dominfo.c libelf-private.h
-libelf-relocate.o: libelf-relocate.c libelf-private.h
-
-$(LIBELF_SRCS) libelf-private.h:
- ln -s ../../xen/common/libelf/$@ $@
-
-# add libelf bits to libxc
-GUEST_SRCS-y += $(LIBELF_SRCS)
+GUEST_SRCS-y += libelf-tools.c libelf-loader.c
+GUEST_SRCS-y += libelf-dominfo.c libelf-relocate.c
# new domain builder
GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c
@@ -125,8 +116,7 @@ clean:
clean:
rm -rf *.rpm $(LIB) *~ $(DEPS) xen \
$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
- $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) \
- $(LIBELF_SRCS) libelf-private.h
+ $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
.PHONY: rpm
rpm: build
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
