tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS

While implementing the --enable-rpath change I noticed that a ocaml
build does not use APPEND_LDFLAGS. Make use of APPEND_CFLAGS and
APPEND_LDFLAGS as it is done already in other places.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: David Scott <dave.scott@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: David Scott <dave.scott@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
index 62ffefb666a3ba7285c8f3cf200f128cf5e7de6c..09d1bc8946ae731072d8e0531df8b4e907f0bfd0 100644 (file)
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
 CFLAGS += -I../mmap
 CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
 CFLAGS += $(CFLAGS_xeninclude)
+CFLAGS += $(APPEND_CFLAGS)
 OCAMLINCLUDE += -I ../mmap
 OCAMLOPTFLAGS += -for-pack Xenbus
 

diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
index 239c1878fe58a4b59521f8010913d45f185d20b6..d24b0144d020060de16f45db7ab9b782e412fe40 100644 (file)
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
 include $(TOPLEVEL)/common.make
 
 CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS += $(APPEND_CFLAGS)
 OCAMLINCLUDE += -I ../mmap
 
 OBJS = xenctrl

diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile
index f2134b864320a2083d98125a95423b36b0b7c552..666eb660b7b2d92a3e57dc61e8412739667810bd 100644 (file)
--- a/tools/ocaml/libs/xentoollog/Makefile
+++ b/tools/ocaml/libs/xentoollog/Makefile
@@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
 CFLAGS += -Wno-declaration-after-statement
 
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS += $(APPEND_CFLAGS)
 OCAMLINCLUDE +=
 
 OBJS = xentoollog

diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
index 61eb44c9f313f4ea7596aea77b20d66c528e3b9a..0d1549dd3a814490c6e36c8127eed143a5b0f304 100644 (file)
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
 
 CFLAGS += $(CFLAGS_libxenlight)
 CFLAGS += -I ../xentoollog
+CFLAGS += $(APPEND_CFLAGS)
 
 OBJS = xenlight
 INTF = xenlight.cmi

diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
index 8033089c2d8b3e5330ab62ba83960f7ab40b90eb..b75726fec3fc496513ba5995b463d300e2165d0b 100644 (file)
--- a/tools/ocaml/test/Makefile
+++ b/tools/ocaml/test/Makefile
@@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
 include $(OCAML_TOPLEVEL)/common.make
 
 CFLAGS += $(CFLAGS_libxenlight)
+CFLAGS += $(APPEND_CFLAGS)
 LIBS_xenlight = $(LDLIBS_libxenlight)
 
 OCAMLINCLUDE += \

diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index 068e04abae16be84d0aa322ecf8d92721168d185..ec19709c70b4f5b1ec4d3003ab00f0fa42a44819 100644 (file)
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD)  += $(SYSTEMD_CFLAGS)
 LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
 
 CFLAGS  += $(CFLAGS-y)
+CFLAGS  += $(APPEND_CFLAGS)
 LDFLAGS += $(LDFLAGS-y)
+LDFLAGS += $(APPEND_LDFLAGS)
 
 OCAMLINCLUDE += \
        -I $(OCAML_TOPLEVEL)/libs/xb \