[Xen-devel] [PATCH 13 of 30] tools: consistently use $({CFLAGS, LDLIBS}_libxenlight) instead of open coding

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300718506 0
# Node ID 5a131a7ca1cf877786f208003daa44b907a2702f
# Parent  d189faef58e1ebec67571879f86519f3aacf3b53
tools: consistently use $({CFLAGS,LDLIBS}_libxenlight) instead of open coding.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r d189faef58e1 -r 5a131a7ca1cf tools/libxl/Makefile
--- a/tools/libxl/Makefile      Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/libxl/Makefile      Mon Mar 21 14:41:46 2011 +0000
@@ -23,8 +23,6 @@ LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLI
 LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) 
$(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS)
 
 LIBXLU_LIBS =
-
-CLIENT_LIBS = $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl)
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o
 ifeq ($(LIBXL_BLKTAP),y)
@@ -105,7 +103,7 @@ libxlutil.a: $(LIBXLU_OBJS)
        $(AR) rcs libxlutil.a $^
 
 $(CLIENTS): $(XL_OBJS) libxlutil.so libxenlight.so
-       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so libxenlight.so 
$(CLIENT_LIBS)
+       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) 
$(LDLIBS_libxenctrl)
 
 .PHONY: install
 install: all
diff -r d189faef58e1 -r 5a131a7ca1cf tools/ocaml/common.make
--- a/tools/ocaml/common.make   Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/common.make   Mon Mar 21 14:41:46 2011 +0000
@@ -9,7 +9,7 @@ OCAMLYACC ?= ocamlyacc
 OCAMLYACC ?= ocamlyacc
 
 CFLAGS += -fPIC -Werror
-CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) 
-I$(TOPLEVEL)/../libxl
+CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) 
$(CFLAGS_libxenlight)
 CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml
 CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel