... also let making other objects go through even if pstopdf are not present.
Signed-off-by: Zheng Li <[email protected]> OMakefile | 12 +++++------- ocaml/idl/OMakefile | 2 +- ocaml/xapi/OMakefile | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff -r 419d6473c6af -r ede6c001c56e OMakefile --- a/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -10,7 +10,7 @@ LIBDIR = lib64 export -# Default to bytecode unless COMPILE_NATIVE is defined +# Default to native code unless COMPILE_NATIVE is defined otherwise if $(not $(defined-env COMPILE_NATIVE)) COMPILE_NATIVE = yes export @@ -59,9 +59,6 @@ #clean: # rm -rf doc/ -.SUBDIRS: ocaml scripts java javascript - - if $(not $(defined-env COMPILE_OCAML)) COMPILE_OCAML = yes export @@ -72,6 +69,8 @@ COMPILE_JAVA = yes export +.SUBDIRS: ocaml scripts $(if $(equal $(COMPILE_JAVA), yes), java) $(if $(equal $(COMPILE_JS), yes), 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) if $(not $(defined-env COMPILE_XENSTUFF)) @@ -113,7 +112,9 @@ ocaml/xenops-ts/runtest \ ocaml/xenguest/xenguest \ ocaml/xenguest/dumpcore \ + ocaml/xiu/xiu \ ocaml/xapi/fakeguestagent \ + ocaml/xapi/quicktestbin \ ocaml/xsrpc/xsrpc \ ocaml/xsrpc/xsrpcd-util \ ocaml/guest/agent \ @@ -137,11 +138,8 @@ ocaml/database/unit_test_marshall \ ocaml/database/block_device_io \ ocaml/toplevel \ - ocaml/xiu/xiu \ ocaml/cdrommon/cdrommon \ ocaml/xapi/stresstest \ - ocaml/xapi/fakeguestagent \ - ocaml/xapi/quicktestbin \ ocaml/xapi/binpack \ ocaml/idl/datamodel \ ocaml/idl/html_build \ diff -r 419d6473c6af -r ede6c001c56e ocaml/idl/OMakefile --- a/ocaml/idl/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/ocaml/idl/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -3,7 +3,7 @@ JQUERY = $(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js JQUERYTREEVIEWZIP = $(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip -PSTOPDF = $(shell bash -c "which pstopdf || which ps2pdf || which ps2pdf14") +PSTOPDF = $(shell bash -c "which pstopdf || which ps2pdf || which ps2pdf14 || echo false") OCAMLINCLUDES = ocaml_backend ../database OCAMLPACKS = xml-light2 sexpr log diff -r 419d6473c6af -r ede6c001c56e ocaml/xapi/OMakefile --- a/ocaml/xapi/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/ocaml/xapi/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -1,4 +1,4 @@ -OCAMLPACKS = xml-light2 cdrom pciutil sexpr log stunnel http-svr rss cpuid xen-utils +OCAMLPACKS = xml-light2 cdrom pciutil sexpr log stunnel http-svr rss xen-utils OCAML_LIBS = ../util/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 \ @@ -16,7 +16,7 @@ # (the same holds for OCaml packages) XEN_OCAML_LIBS = ../netdev/netdev ../xenops/xenops ../auth/pam XEN_OCAMLINCLUDES = -XEN_OCAMLPACKS = xc xs +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))
# HG changeset patch # User Zheng Li <[email protected]> # Date 1269305449 0 # Node ID ede6c001c56ea614b3f800378a6fd0d880906374 # Parent 419d6473c6afec9cf87b2d8554ef5fb641294026 Fix a few Makefile issues on compiling XAPI client without Xen stuff ... also let making other objects go through even if pstopdf are not present. Signed-off-by: Zheng Li <[email protected]> diff -r 419d6473c6af -r ede6c001c56e OMakefile --- a/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -10,7 +10,7 @@ LIBDIR = lib64 export -# Default to bytecode unless COMPILE_NATIVE is defined +# Default to native code unless COMPILE_NATIVE is defined otherwise if $(not $(defined-env COMPILE_NATIVE)) COMPILE_NATIVE = yes export @@ -59,9 +59,6 @@ #clean: # rm -rf doc/ -.SUBDIRS: ocaml scripts java javascript - - if $(not $(defined-env COMPILE_OCAML)) COMPILE_OCAML = yes export @@ -72,6 +69,8 @@ COMPILE_JAVA = yes export +.SUBDIRS: ocaml scripts $(if $(equal $(COMPILE_JAVA), yes), java) $(if $(equal $(COMPILE_JS), yes), 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) if $(not $(defined-env COMPILE_XENSTUFF)) @@ -113,7 +112,9 @@ ocaml/xenops-ts/runtest \ ocaml/xenguest/xenguest \ ocaml/xenguest/dumpcore \ + ocaml/xiu/xiu \ ocaml/xapi/fakeguestagent \ + ocaml/xapi/quicktestbin \ ocaml/xsrpc/xsrpc \ ocaml/xsrpc/xsrpcd-util \ ocaml/guest/agent \ @@ -137,11 +138,8 @@ ocaml/database/unit_test_marshall \ ocaml/database/block_device_io \ ocaml/toplevel \ - ocaml/xiu/xiu \ ocaml/cdrommon/cdrommon \ ocaml/xapi/stresstest \ - ocaml/xapi/fakeguestagent \ - ocaml/xapi/quicktestbin \ ocaml/xapi/binpack \ ocaml/idl/datamodel \ ocaml/idl/html_build \ diff -r 419d6473c6af -r ede6c001c56e ocaml/idl/OMakefile --- a/ocaml/idl/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/ocaml/idl/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -3,7 +3,7 @@ JQUERY = $(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js JQUERYTREEVIEWZIP = $(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip -PSTOPDF = $(shell bash -c "which pstopdf || which ps2pdf || which ps2pdf14") +PSTOPDF = $(shell bash -c "which pstopdf || which ps2pdf || which ps2pdf14 || echo false") OCAMLINCLUDES = ocaml_backend ../database OCAMLPACKS = xml-light2 sexpr log diff -r 419d6473c6af -r ede6c001c56e ocaml/xapi/OMakefile --- a/ocaml/xapi/OMakefile Tue Mar 30 14:22:11 2010 +0100 +++ b/ocaml/xapi/OMakefile Tue Mar 23 00:50:49 2010 +0000 @@ -1,4 +1,4 @@ -OCAMLPACKS = xml-light2 cdrom pciutil sexpr log stunnel http-svr rss cpuid xen-utils +OCAMLPACKS = xml-light2 cdrom pciutil sexpr log stunnel http-svr rss xen-utils OCAML_LIBS = ../util/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 \ @@ -16,7 +16,7 @@ # (the same holds for OCaml packages) XEN_OCAML_LIBS = ../netdev/netdev ../xenops/xenops ../auth/pam XEN_OCAMLINCLUDES = -XEN_OCAMLPACKS = xc xs +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))
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
