Mailing List Archive

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1301596215 -3600
# Node ID fa7d0d7c0718e98bfc8dd16614cf11677d441df9
# Parent 527efe003178fe6050f6c711d4b286c477d12fd9
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>
---


diff -r 527efe003178 -r fa7d0d7c0718 tools/ocaml/common.make
--- a/tools/ocaml/common.make Thu Mar 31 19:27:40 2011 +0100
+++ b/tools/ocaml/common.make Thu Mar 31 19:30:15 2011 +0100
@@ -9,7 +9,6 @@
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 -r 527efe003178 -r fa7d0d7c0718 tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 19:27:40 2011 +0100
+++ b/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 19:30:15 2011 +0100
@@ -2,6 +2,8 @@
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 -r 527efe003178 -r fa7d0d7c0718 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile Thu Mar 31 19:27:40 2011 +0100
+++ b/tools/ocaml/libs/xb/Makefile Thu Mar 31 19:30:15 2011 +0100
@@ -3,6 +3,8 @@
include $(TOPLEVEL)/common.make

CFLAGS += -I../mmap
+CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
+CFLAGS += $(CFLAGS_xeninclude)
OCAMLINCLUDE += -I ../mmap

.NOTPARALLEL:
diff -r 527efe003178 -r fa7d0d7c0718 tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile Thu Mar 31 19:27:40 2011 +0100
+++ b/tools/ocaml/libs/xl/Makefile Thu Mar 31 19:30:15 2011 +0100
@@ -2,6 +2,8 @@
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make

+CFLAGS += $(CFLAGS_libxenlight)
+
OBJS = xl
INTF = xl.cmi
LIBS = xl.cma xl.cmxa

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