[Xen-devel] [PATCH 2 of 2] build: append YAJL_CLFAGS and YAJL_LDFLAGS to libxl build

[Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>]

# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
# Date 1317900172 -7200
# Node ID dd09f32c882c9e1492b2346b899fef19f46055dd
# Parent  fb73bd21cdf7aed429f7e90e192dcbc034f3ca57
build: append YAJL_CLFAGS and YAJL_LDFLAGS to libxl build

Since some users have yajl installed in a non-standard directory, allow the use 
of YAJL_CFLAGS and YAJL_LDFLAGS to point to the correct folders.

Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>

diff -r fb73bd21cdf7 -r dd09f32c882c tools/libxl/Makefile
--- a/tools/libxl/Makefile      Thu Oct 06 13:20:03 2011 +0200
+++ b/tools/libxl/Makefile      Thu Oct 06 13:22:52 2011 +0200
@@ -13,7 +13,7 @@ LIBUUID_LIBS += -luuid
 endif
 
 LIBXL_LIBS =
-LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) 
$(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS)
+LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) 
$(LDLIBS_libblktapctl) $(UTIL_LIBS) $(LIBUUID_LIBS) $(YAJL_LDFLAGS)
 
 LIBXLU_LIBS =
 
@@ -34,7 +34,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_c
                        libxl_qmp.o $(LIBXL_OBJS-y)
 LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o
 
-$(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) 
$(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
+$(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) 
$(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) $(YAJL_CFLAGS)
 
 AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h
 AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c

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