[Xen-changelog] [xen-unstable] Use VPATH instead of symlinks for libelf inclusion into libxenctrl.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201342538 0
# Node ID a4335050220ca791d7fc4855678c797ab1641159
# Parent  c2216dce87fba6866de8814b19ab580a852f65b6
Use VPATH instead of symlinks for libelf inclusion into libxenctrl.
Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 tools/libxc/Makefile |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff -r c2216dce87fb -r a4335050220c tools/libxc/Makefile
--- a/tools/libxc/Makefile      Fri Jan 25 16:30:34 2008 +0000
+++ b/tools/libxc/Makefile      Sat Jan 26 10:15:38 2008 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog