Remove the COMPILE_XENSTUFF environment variable from the Makefile/OMakefile -- we...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/OMakefile b/OMakefile
index 6c9db009bb7c844347d1fa077927d6054c3d01d8..f8c17ec50dd06e0a5cbe931082bf53873664a0ac 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -70,9 +70,6 @@ export
 
 .SUBDIRS: ocaml scripts $(if $(COMPILE_JAVA), java) $(if $(COMPILE_JS), javascript)
 
-# inherits COMPILE_XENSTUFF from the Makefile (NB don't set it here or else
-# you can't build the fakeserver etc on a machine without Xen, e.g. an Apple)
-COMPILE_XENSTUFF=$(getenv COMPILE_XENSTUFF, no)
 export
 
 .PHONY: none
@@ -154,7 +151,7 @@ OCAML_PHASE3_NOXEN = \
        ocaml/multipathrt/multipathrt
 
 
-OCAML_PHASE3 = $(if $(COMPILE_XENSTUFF),$(OCAML_PHASE3_XEN)) $(OCAML_PHASE3_NOXEN)
+OCAML_PHASE3 = $(OCAML_PHASE3_XEN) $(OCAML_PHASE3_NOXEN)
 
 OCAML_PHASE1_TARGETS = $(if $(COMPILE_OCAML), $(OCAML_PHASE1))
 OCAML_PHASE2_TARGETS = $(if $(COMPILE_OCAML), $(OCAML_PHASE2))

diff --git a/ocaml/xapi/OMakefile b/ocaml/xapi/OMakefile
index 36872d5a3aa7546dda247466f85b90972ba5b3b8..800036cb833b436f14e730241df6aad3a4e20a59 100644 (file)
--- a/ocaml/xapi/OMakefile
+++ b/ocaml/xapi/OMakefile
@@ -17,13 +17,13 @@ CFLAGS += -std=gnu99 -Wall -Werror -I$(shell ocamlc -where)
 XEN_OCAML_LIBS = ../xenops/xenops ../auth/pam
 XEN_OCAMLINCLUDES =
 XEN_OCAMLPACKS = xc xs cpuid
-OCAML_CLIBS = $(if $(equal $(COMPILE_XENSTUFF), yes), $(XEN_OCAML_CLIBS) $(OCAML_CLIBS), $(OCAML_CLIBS)) 
-OCAML_LINK_FLAGS = $(if $(equal $(COMPILE_XENSTUFF), yes), $(XEN_OCAML_LINK_FLAGS) $(OCAML_LINK_FLAGS), $(OCAML_LINK_FLAGS))
-CFLAGS = $(if $(equal $(COMPILE_XENSTUFF), yes), $(XEN_CFLAGS) $(CFLAGS), $(CFLAGS))
-OCAMLINCLUDES = $(if $(equal $(COMPILE_XENSTUFF), yes), $(XEN_OCAMLINCLUDES) $(OCAMLINCLUDES), $(OCAMLINCLUDES))
+OCAML_CLIBS = $(XEN_OCAML_CLIBS) $(OCAML_CLIBS)
+OCAML_LINK_FLAGS = $(XEN_OCAML_LINK_FLAGS) $(OCAML_LINK_FLAGS)
+CFLAGS = $(XEN_CFLAGS) $(CFLAGS)
+OCAMLINCLUDES = $(XEN_OCAMLINCLUDES) $(OCAMLINCLUDES)
 # xc.cma depends on uuid.cma
-OCAML_LIBS = $(if $(equal $(COMPILE_XENSTUFF), yes), $(OCAML_LIBS) $(XEN_OCAML_LIBS), $(OCAML_LIBS)) 
-OCAMLPACKS = $(if $(equal $(COMPILE_XENSTUFF), yes), $(XEN_OCAMLPACKS) $(OCAMLPACKS), $(OCAMLPACKS))
+OCAML_LIBS = $(OCAML_LIBS) $(XEN_OCAML_LIBS)
+OCAMLPACKS = $(XEN_OCAMLPACKS) $(OCAMLPACKS)
 
 # -----------------------------------------------------------------------
 # Build the server