tools: Update CFLAGS for qemu-xen to allow it to use new libraries

This means adding -L for libxen{evtchn,gnttab,foreignmemory} so that
it can link them directly (rather than using the libxenctrl compat
layer exposed via -rpath-link). Also add -I for libxenforeignmemory.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 61785d7ba469c9095c041631da04e2da38ecbe7d..15680a5b26efb3625212cfef2051c8df80b67df4 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -256,12 +256,16 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                -I$(XEN_ROOT)/tools/libs/toollog/include \
                -I$(XEN_ROOT)/tools/libs/evtchn/include \
                -I$(XEN_ROOT)/tools/libs/gnttab/include \
+               -I$(XEN_ROOT)/tools/libs/foreignmemory/include \
                -I$(XEN_ROOT)/tools/libxc/include \
                -I$(XEN_ROOT)/tools/xenstore/include \
                -I$(XEN_ROOT)/tools/xenstore/compat/include \
                $(EXTRA_CFLAGS_QEMU_XEN)" \
                --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
                -L$(XEN_ROOT)/tools/xenstore \
+               -L$(XEN_ROOT)/tools/libs/evtchn \
+               -L$(XEN_ROOT)/tools/libs/gnttab \
+               -L$(XEN_ROOT)/tools/libs/foreignmemory \
                -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \
                -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/evtchn \
                -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \