omake: Completely remove all UseCamlp4 definitions

As they aren't required anymore - we've switched to ppx-based syntax
extensions.

This commit corresponds to 773dbc9 on master.

Signed-off-by: Gabor Igloi <[email protected]>

Author: gaborigloi

OMakeroot

@@ -74,17 +74,6 @@ OCamlLibraryClib(name, files, clibs) =
 
    return $(array $(if $(NATIVE_ENABLED), $(NATIVELIB)), $(if $(NATIVE_ENABLED), $(CLIB)), $(if $(BYTE_ENABLED), $(BYTELIB)))
 
-#
-# Use Camlp4
-#
-UseCamlp4(packs, files) =
-       OCAMLPACKS     += $(packs)
-       OCAMLFINDFLAGS += -syntax camlp4o
-       $(addsuffix .cmx, $(files)):
-       $(addsuffix .o, $(files)):
-       $(addsuffix .cmi, $(files)):
-       $(addsuffix .cmo, $(files)):
-
 #
 # Include the OMakefile in this directory.
 #

ocaml/autogen/OMakefile

@@ -7,8 +7,6 @@ OCAMLPACKS    = xml-light2 sexpr http-svr xcp rpclib
 clean:
 	rm -rf *.*
 
-UseCamlp4(rpclib.syntax, aPI)
-
 DB_ACTIONS_FILES = db_actions $(AUTOGEN_HELPER_DIR)/string_unmarshall_helper $(AUTOGEN_HELPER_DIR)/string_marshall_helper $(AUTOGEN_HELPER_DIR)/db_action_helper $(AUTOGEN_HELPER_DIR)/db_remote_marshall $(AUTOGEN_HELPER_DIR)/db_filter_types $(AUTOGEN_HELPER_DIR)/db_filter $(AUTOGEN_HELPER_DIR)/db_filter_parse $(AUTOGEN_HELPER_DIR)/db_filter_lex
 OCamlProgram(db_actions, $(DB_ACTIONS_FILES))
 

ocaml/doc/OMakefile

@@ -1,9 +1,6 @@
 OCAML_LIBS += ../idl/datamodel
 OCAMLINCLUDES += ../idl
 
-CAMLP4_FILES = jsapi
-UseCamlp4(rpclib.syntax, $(CAMLP4_FILES))
-
 OCamlProgram(jsapi, jsapi)
 
 .PHONY: doc-html

ocaml/idl/OMakefile

@@ -5,10 +5,6 @@ PSTOPDF = $(shell bash -c "which pstopdf 2>/dev/null || which ps2pdf 2>/dev/null
 OCAMLINCLUDES  = ocaml_backend ../database
 OCAMLPACKS     = xml-light2 sexpr xcp rpclib http-svr uuid
 
-CAMLP4_FILES = datamodel_types
-
-UseCamlp4(rpclib.syntax, $(CAMLP4_FILES))
-
 # -----------------------------------------------------------------------
 # Build datamodel library
 # -----------------------------------------------------------------------

ocaml/idl/json_backend/OMakefile

@@ -4,9 +4,6 @@ OCAML_LIBS += ../datamodel
 
 OCamlProgram(main, main)
 
-CAMLP4_FILES = main
-UseCamlp4(rpclib.syntax, $(CAMLP4_FILES))
-
 .PHONY: clean
 clean:
         rm -f *~ *.opt *.run *.a *.cma *.cmxa *.cmo *.cmi *.o *.cmx *.omc *.annot main *.json

ocaml/idl/ocaml_backend/OMakefile

@@ -11,10 +11,6 @@ OCAMLINCLUDES += ../.. ../../database $(AUTOGEN_DIR) ../../xapi ../../client_rec
 
 OCAMLPACKS += sexpr xml-light2 http-svr rpclib stunnel
 
-CAMLP4_FILES = event_types
-
-UseCamlp4(rpclib.syntax, $(CAMLP4_FILES))
-
 # only gen_api requires datamodel library:
 GEN_API_FILES = gen_api gen_test genOCaml ref ocaml_syntax gen_db_actions gen_db_check gen_empty_custom gen_client gen_server gen_common gen_rbac ../../database/escaping locking ../api_lowlevel gen_api_main ../datamodel ../constants ../api_errors ../api_messages ../datamodel_utils ../datamodel_values ocaml_utils ../datamodel_types ../dm_api $(AUTOGEN_HELPER_DIR)/string_marshall_helper
 OCamlProgram(gen_api_main, $(GEN_API_FILES))

ocaml/license/OMakefile

@@ -2,8 +2,6 @@ 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
 
-UseCamlp4(rpclib.syntax, v6rpc v6errors)
-
 # Name of programs to install in dom0:
 DAILY_LICENSE_CHECK = daily-license-check
 

ocaml/xapi/OMakefile

@@ -11,10 +11,6 @@ OCAMLINCLUDES = ../idl ../idl/ocaml_backend \
 	../xva ../util \
 	../auth ../license ../client_records ../rfb ../gpg
 
-UseCamlp4(rpclib.syntax, features storage_impl xapi_udhcpd storage_migrate \
-          xapi_services system_domains cancel_tests config_file_sync updates \
-          sparse_dd_wrapper vhd_tool_wrapper)
-
 CFLAGS += -std=gnu99 -Wall -Werror -I$(shell ocamlc -where)
 
 #XENLIGHT_LINK_FLAGS= -cclib -lxlutil -cclib -luuid -cclib -lblktapctl -cclib -lutil -cclib -lxenlight -cclib -lxenstore