Further ppx updates

jonludlam · lindig · commit e8fc9e9aae86 · 2017-02-14T16:07:29.000Z
Signed-off-by: Jon Ludlam &lt;jonathan.ludlam@citrix.com&gt;
diff --git a/ocaml/OMakefile b/ocaml/OMakefile
@@ -1,7 +1,7 @@
 # You must set your XEN_ROOT env var before building
 XEN_CFLAGS    = -I$(XEN_ROOT)/usr/include
 OCAMLINCLUDES = $(ROOT)/ocaml/idl +ocamldoc
-OCAML_LIBS    = $(ROOT)/ocaml/util/version $(ROOT)/ocaml/util/stats
+OCAML_LIBS    = $(ROOT)/ocaml/util/xapi_version $(ROOT)/ocaml/util/stats
 OCAMLPACKS    = stdext uuid gzip
 
 .SUBDIRS: \
diff --git a/ocaml/cdrommon/OMakefile b/ocaml/cdrommon/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common
 OCAMLINCLUDES = ../xapi
 OCAMLPACKS += unix cdrom xcp-inventory
 
diff --git a/ocaml/database/OMakefile b/ocaml/database/OMakefile
@@ -20,7 +20,7 @@ DATABASE_SERVER_FILES = database_server_main test_schemas ../autogen/db_actions
 DATABASE_TEST_FILES = db_cache_test test_schemas
 section:
 	#XXX there are lots of interdependencies which we should be aim to remove
-	OCAML_LIBS += ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../util/stats ../idl/ocaml_backend/server
+	OCAML_LIBS += ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../util/stats ../idl/ocaml_backend/server
 	OCamlProgram(database_server, $(DATABASE_SERVER_FILES))
 	OCamlProgram(database_test, $(DATABASE_TEST_FILES))
 
diff --git a/ocaml/db_process/OMakefile b/ocaml/db_process/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../util/stats ../idl/ocaml_backend/server
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../util/stats ../idl/ocaml_backend/server
 OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../database
 OCAMLPACKS    =  xml-light2 uuid sexpr xcp stunnel http-svr gzip uuid xcp-inventory
 
diff --git a/ocaml/events/OMakefile b/ocaml/events/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client 
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client 
 OCAMLINCLUDES = ../idl/ocaml_backend ../autogen
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr xcp rpclib uuid
 
diff --git a/ocaml/graph/OMakefile b/ocaml/graph/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
 OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr xcp rpclib uuid
 
diff --git a/ocaml/license/OMakefile b/ocaml/license/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/xapi_client
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/xapi_client
 OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen ../xapi ../gpg ../util
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr xcp rpclib uuid systemd
 
diff --git a/ocaml/mpathalert/OMakefile b/ocaml/mpathalert/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
 OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr xcp rpclib uuid
 
diff --git a/ocaml/perftest/OMakefile b/ocaml/perftest/OMakefile
@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAML_LIBS    = ../util/xapi_version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
 OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../idl ../autogen ../client_records
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr xcp rpclib uuid xcp-inventory
 
diff --git a/ocaml/test/OMakefile b/ocaml/test/OMakefile
@@ -13,7 +13,7 @@ OCAMLINCLUDES = \
 	../license \
 
 OCAML_LIBS = \
-	../util/version \
+	../util/xapi_version \
 	../idl/ocaml_backend/common \
 	../idl/ocaml_backend/client \
 	../idl/ocaml_backend/server \
diff --git a/ocaml/xapi/OMakefile b/ocaml/xapi/OMakefile
@@ -4,7 +4,7 @@ OCAMLPACKS = oclock xml-light2 cdrom pciutil sexpr xcp stunnel		\
              xcp.xen xcp.memory xcp.v6 tar tar.unix oPasswd xcp-inventory \
              rrdd-plugin rrd-transport pci
 
-OCAML_LIBS    = ../util/version ../util/vm_memory_constraints ../util/sanitycheck ../util/stats \
+OCAML_LIBS    = ../util/xapi_version ../util/vm_memory_constraints ../util/sanitycheck ../util/stats \
 	../idl/ocaml_backend/common ../idl/ocaml_backend/client ../idl/ocaml_backend/server ../util/ocamltest
 OCAMLINCLUDES = ../idl ../idl/ocaml_backend \
 	../autogen ../database/ \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-OCAML_LIBS = ../util/version ../idl/ocaml_backend/common`
	`1`	`+OCAML_LIBS = ../util/xapi_version ../idl/ocaml_backend/common`
`2`	`2`	`OCAMLINCLUDES = ../xapi`
`3`	`3`	`OCAMLPACKS += unix cdrom xcp-inventory`
`4`	`4`