[Xen-devel] [PATCH 2/2] ocaml: Substitute tools/ocaml/common.make with configure

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

Rename tools/ocaml/common.make to .in, and add it to the list of files
to generate.  Add it to .gitignore.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 .gitignore                 |  1 +
 tools/configure.ac         |  1 +
 tools/ocaml/common.make    | 22 ----------------------
 tools/ocaml/common.make.in | 22 ++++++++++++++++++++++
 4 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 tools/ocaml/common.make
 create mode 100644 tools/ocaml/common.make.in

diff --git a/.gitignore b/.gitignore
index 01ad29e..ce4dc7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ config.status
 config.cache
 config/Toplevel.mk
 config/Paths.mk
+tools/ocaml/common.make
 
 build-*
 dist/*
diff --git a/tools/configure.ac b/tools/configure.ac
index 873e18d..ca855f6 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -7,6 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh 
../xen/Makefile]),
 AC_CONFIG_SRCDIR([libxl/libxl.c])
 AC_CONFIG_FILES([
 ../config/Tools.mk
+ocaml/common.make
 hotplug/FreeBSD/rc.d/xencommons
 hotplug/FreeBSD/rc.d/xendriverdomain
 hotplug/Linux/init.d/sysconfig.xencommons
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
deleted file mode 100644
index d5478f6..0000000
--- a/tools/ocaml/common.make
+++ /dev/null
@@ -1,22 +0,0 @@
-include $(XEN_ROOT)/tools/Rules.mk
-
-CC ?= gcc
-OCAMLOPT ?= ocamlopt
-OCAMLC ?= ocamlc
-OCAMLMKLIB ?= ocamlmklib
-OCAMLDEP ?= ocamldep
-OCAMLLEX ?= ocamllex
-OCAMLYACC ?= ocamlyacc
-OCAMLFIND ?= ocamlfind
-
-CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
-
-OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
-OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) 
-cc $(CC) -w F -warn-error F
-OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
-
-VERSION := 4.1
-
-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
-
-o= >$@.new && mv -f $@.new $@
diff --git a/tools/ocaml/common.make.in b/tools/ocaml/common.make.in
new file mode 100644
index 0000000..d5478f6
--- /dev/null
+++ b/tools/ocaml/common.make.in
@@ -0,0 +1,22 @@
+include $(XEN_ROOT)/tools/Rules.mk
+
+CC ?= gcc
+OCAMLOPT ?= ocamlopt
+OCAMLC ?= ocamlc
+OCAMLMKLIB ?= ocamlmklib
+OCAMLDEP ?= ocamldep
+OCAMLLEX ?= ocamllex
+OCAMLYACC ?= ocamlyacc
+OCAMLFIND ?= ocamlfind
+
+CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
+
+OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) 
-cc $(CC) -w F -warn-error F
+OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
+
+VERSION := 4.1
+
+OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
+
+o= >$@.new && mv -f $@.new $@
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel