# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300718506 0
# Node ID 2276552067f8cad6123115534524bfa4bdbadb30
# Parent 27741a8c4a6fe0d6abf239977538c013bd474998
tools: ocaml: push CFLAGS usage down into the specific bindings
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 27741a8c4a6f -r 2276552067f8 tools/ocaml/common.make
--- a/tools/ocaml/common.make Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/common.make Mon Mar 21 14:41:46 2011 +0000
@@ -9,7 +9,6 @@ OCAMLYACC ?= ocamlyacc
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 27741a8c4a6f -r 2276552067f8 tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/libs/eventchn/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -1,6 +1,8 @@ TOPLEVEL=$(CURDIR)/../..
TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
OBJS = eventchn
INTF = $(foreach obj, $(OBJS),$(obj).cmi)
diff -r 27741a8c4a6f -r 2276552067f8 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/libs/xb/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -3,6 +3,8 @@ include $(TOPLEVEL)/common.make
include $(TOPLEVEL)/common.make
CFLAGS += -I../mmap
+CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
+CFLAGS += $(CFLAGS_xeninclude)
OCAMLINCLUDE += -I ../mmap
.NOTPARALLEL:
diff -r 27741a8c4a6f -r 2276552067f8 tools/ocaml/libs/xb/xs_ring_stubs.c
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c Mon Mar 21 14:41:46 2011 +0000
@@ -34,10 +34,6 @@
#include "mmap_stubs.h"
#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
-
-#ifndef xen_mb
-#define xen_mb() mb()
-#endif
static int xs_ring_read(struct mmap_interface *interface,
char *buffer, int len)
diff -r 27741a8c4a6f -r 2276552067f8 tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/libs/xl/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -1,6 +1,8 @@ TOPLEVEL=$(CURDIR)/../..
TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+
+CFLAGS += $(CFLAGS_libxenlight)
OBJS = xl
INTF = xl.cmi
diff -r 27741a8c4a6f -r 2276552067f8 tools/ocaml/libs/xs/Makefile
--- a/tools/ocaml/libs/xs/Makefile Mon Mar 21 14:41:46 2011 +0000
+++ b/tools/ocaml/libs/xs/Makefile Mon Mar 21 14:41:46 2011 +0000
@@ -23,14 +23,6 @@ xs_OBJS = $(OBJS)
xs_OBJS = $(OBJS)
OCAML_NOC_LIBRARY = xs
-#xs.cmxa: $(foreach obj,$(OBJS),$(obj).cmx)
-# $(E) " MLLIB $@"
-# $(Q)$(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $@ $(foreach
obj,$(OBJS),$(obj).cmx)
-#
-#xs.cma: $(foreach obj,$(OBJS),$(obj).cmo)
-# $(E) " MLLIB $@"
-# $(Q)$(OCAMLC) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmo)
-
.PHONY: install
install: $(LIBS) META
mkdir -p $(OCAMLDESTDIR)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home