aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ocaml
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-03-31 19:30:15 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-03-31 19:30:15 +0100
commitd9a50d2603e9c826fb78aa35858ff469815f9b19 (patch)
tree17d2aedbc69eebbdc1e6dfdaa7b8eb411cff2a2e /tools/ocaml
parent825bc99c9df68bccf55abaea19e6da16d9a292aa (diff)
downloadxen-d9a50d2603e9c826fb78aa35858ff469815f9b19.tar.gz
xen-d9a50d2603e9c826fb78aa35858ff469815f9b19.tar.bz2
xen-d9a50d2603e9c826fb78aa35858ff469815f9b19.zip
tools: ocaml: push CFLAGS usage down into the specific bindings
So each binding only builds against what it requires. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/ocaml')
-rw-r--r--tools/ocaml/common.make1
-rw-r--r--tools/ocaml/libs/eventchn/Makefile2
-rw-r--r--tools/ocaml/libs/xb/Makefile2
-rw-r--r--tools/ocaml/libs/xl/Makefile2
4 files changed, 6 insertions, 1 deletions
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
index 6de48e1997..04a0b6b1ff 100644
--- a/tools/ocaml/common.make
+++ b/tools/ocaml/common.make
@@ -9,7 +9,6 @@ OCAMLLEX ?= ocamllex
OCAMLYACC ?= ocamlyacc
CFLAGS += -fPIC -Werror
-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
diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile
index 69e08c160e..926e3fbe26 100644
--- a/tools/ocaml/libs/eventchn/Makefile
+++ b/tools/ocaml/libs/eventchn/Makefile
@@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
+
OBJS = eventchn
INTF = $(foreach obj, $(OBJS),$(obj).cmi)
LIBS = eventchn.cma eventchn.cmxa
diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
index 317d879c2c..dc858828f1 100644
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -3,6 +3,8 @@ XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
CFLAGS += -I../mmap
+CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
+CFLAGS += $(CFLAGS_xeninclude)
OCAMLINCLUDE += -I ../mmap
.NOTPARALLEL:
diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
index e9f0608187..8e31b72424 100644
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+CFLAGS += $(CFLAGS_libxenlight)
+
OBJS = xl
INTF = xl.cmi
LIBS = xl.cma xl.cmxa