@@ -37,6 +37,7 @@ config.status
config.cache
config/Toplevel.mk
config/Paths.mk
+tools/ocaml/common.make
build-*
dist/*
@@ -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
deleted file mode 100644
@@ -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 $@
new file mode 100644
@@ -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 $@
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@eu.citrix.com> --- .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