[Xen-changelog] [xen-unstable] tools: consistently use $({CFLAGS, LDLIBS}_libxenlight) instead of open coding.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

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

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 73438064b7dc -r 3831bd253e02 tools/libxl/Makefile
--- a/tools/libxl/Makefile      Mon Mar 21 18:06:27 2011 +0000
+++ b/tools/libxl/Makefile      Mon Mar 21 18:07:06 2011 +0000
@@ -24,8 +24,6 @@
 
 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)
 LIBXL_OBJS-y += libxl_blktap2.o
@@ -105,7 +103,7 @@
        $(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 73438064b7dc -r 3831bd253e02 tools/ocaml/common.make
--- a/tools/ocaml/common.make   Mon Mar 21 18:06:27 2011 +0000
+++ b/tools/ocaml/common.make   Mon Mar 21 18:07:06 2011 +0000
@@ -9,7 +9,7 @@
 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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog