tools/ocaml: simplify compile/link of test apps

xtl doesn't require the full LDLIBS_libxenctrl, just the -L and
xenlight.cmxa, the latter which contains LDLIBS_libxenctrl as needed.
Fixing this avoids the need to be concerned about LDLIBS_libxenctrl
becoming more than one word in the future.

Since the tests are pure ocaml (no C components) CFLAGS and
LIBS_xenlight are not required.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: David Scott <dave@recoil.org>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Cc: David Scott <dave@recoil.org>

diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
index b75726fec3fc496513ba5995b463d300e2165d0b..30a304b6d1d2f2c9354751b19c7c5decb7b9d33e 100644 (file)
--- a/tools/ocaml/test/Makefile
+++ b/tools/ocaml/test/Makefile
@@ -2,9 +2,7 @@ XEN_ROOT = $(CURDIR)/../../..
 OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 
-CFLAGS += $(CFLAGS_libxenlight)
 CFLAGS += $(APPEND_CFLAGS)
-LIBS_xenlight = $(LDLIBS_libxenlight)
 
 OCAMLINCLUDE += \
        -I $(OCAML_TOPLEVEL)/libs/xentoollog \
@@ -16,7 +14,7 @@ PROGRAMS = xtl send_debug_keys list_domains raise_exception dmesg
 
 xtl_LIBS =  \
        -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xentoollog $(OCAML_TOPLEVEL)/libs/xentoollog/xentoollog.cmxa \
-       -cclib $(LDLIBS_libxenctrl)
+       -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xl $(OCAML_TOPLEVEL)/libs/xl/xenlight.cmxa
 
 xtl_OBJS = xtl