From 5eb11a181bcdbc054103c0157309cdd90c9dea00 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 21 Mar 2011 18:07:06 +0000 Subject: [PATCH] tools: consistently use $({CFLAGS,LDLIBS}_libxenlight) instead of open coding. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/Makefile | 4 +--- tools/ocaml/common.make | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index ffcbf6c4ed..39f53f6c03 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -24,8 +24,6 @@ LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $( 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 @@ 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 --git a/tools/ocaml/common.make b/tools/ocaml/common.make index c12ef7d9f5..6de48e1997 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -9,7 +9,7 @@ OCAMLLEX ?= ocamllex 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 -- 2.39.5