diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-21 18:05:49 +0000 |
| commit | ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4 (patch) | |
| tree | 0ab1f5bd7b6d51a2ff3b6ad80b3ccf15b8e74181 /tools/ocaml | |
| parent | 3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c (diff) | |
| download | xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.gz xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.bz2 xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.zip | |
tools: consistently use $({CFLAGS,LDLIBS}_libxenctrl) instead of open coding.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/ocaml')
| -rw-r--r-- | tools/ocaml/common.make | 2 | ||||
| -rw-r--r-- | tools/ocaml/libs/xc/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 4f5130cc4e..1dd059188e 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -9,7 +9,7 @@ OCAMLLEX ?= ocamllex OCAMLYACC ?= ocamlyacc CFLAGS += -fPIC -Werror -CFLAGS += $(CFLAGS_xeninclude) -I$(TOPLEVEL)/../libxc -I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl +CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) -I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl 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/xc/Makefile b/tools/ocaml/libs/xc/Makefile index 6298e46f55..387826aa56 100644 --- a/tools/ocaml/libs/xc/Makefile +++ b/tools/ocaml/libs/xc/Makefile @@ -2,14 +2,14 @@ TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make -CFLAGS += -I../mmap -I$(XEN_ROOT)/tools/libxc -OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc +CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +OCAMLINCLUDE += -I ../mmap -I ../uuid OBJS = xc INTF = xc.cmi LIBS = xc.cma xc.cmxa -LIBS_xc = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest +LIBS_xc = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) xc_OBJS = $(OBJS) xc_C_OBJS = xc_stubs |