diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2008-01-05 15:16:31 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2008-01-05 15:16:31 +0000 |
| commit | 3126bfee333b5c635dc60a54265936af06117f6a (patch) | |
| tree | e08310b1d4b007eec44381390c84049b1dd8658b /examples | |
| parent | 1e65c6c293a0f7917e87438330e2583bd38758dd (diff) | |
| download | virt-top-3126bfee333b5c635dc60a54265936af06117f6a.tar.gz virt-top-3126bfee333b5c635dc60a54265936af06117f6a.tar.xz virt-top-3126bfee333b5c635dc60a54265936af06117f6a.zip | |
Build libvirt and examples on Windows (MinGW).
* aclocal.m4: Add AC_CHECK_OCAML_MODULE to check for OCaml
modules directly (without ocamlfind being needed).
* configure.ac: Remove requirement for ocamlfind.
* config.guess, config.sub: Ship these files to guess host,
build and target.
* libvirt/Makefile.in, examples/Makefile.in: Change these
so they don't require ocamlfind, do the right thing on MinGW.
* Make.rules.in: Make.rules is now generated from this file.
File can use ocamlfind or direct ocaml commands as available.
* .hgignore: Ignore some generated files on Windows.
Diffstat (limited to 'examples')
| -rwxr-xr-x[-rw-r--r--] | examples/.depend | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | examples/Makefile.in | 46 | ||||
| -rwxr-xr-x[-rw-r--r--] | examples/list_domains.ml | 0 |
3 files changed, 43 insertions, 3 deletions
diff --git a/examples/.depend b/examples/.depend index bc5cec2..bc5cec2 100644..100755 --- a/examples/.depend +++ b/examples/.depend diff --git a/examples/Makefile.in b/examples/Makefile.in index 179b360..0f0c527 100644..100755 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,10 +1,37 @@ +# ocaml-libvirt +# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +OCAMLFIND = @OCAMLFIND@ + +ifneq ($(OCAMLFIND),) OCAMLCPACKAGES := -package unix -I ../libvirt OCAMLCFLAGS := -g OCAMLCLIBS := -linkpkg - OCAMLOPTPACKAGES := $(OCAMLCPACKAGES) OCAMLOPTFLAGS := OCAMLOPTLIBS := $(OCAMLCLIBS) +else +OCAMLCINCS := -I ../libvirt +OCAMLCFLAGS := -g +OCAMLCLIBS := unix.cma +OCAMLOPTINCS := $(OCAMLCINCS) +OCAMLOPTFLAGS := +OCAMLOPTLIBS := unix.cmxa +endif export LIBRARY_PATH=../libvirt export LD_LIBRARY_PATH=../libvirt @@ -16,14 +43,27 @@ all: $(BYTE_TARGETS) opt: $(OPT_TARGETS) +ifneq ($(OCAMLFIND),) list_domains: list_domains.cmo - ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \ + $(OCAMLFIND) ocamlc \ + $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \ ../libvirt/mllibvirt.cma -o $@ $< list_domains.opt: list_domains.cmx - ocamlfind ocamlopt \ + $(OCAMLFIND) ocamlopt \ $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \ ../libvirt/mllibvirt.cmxa -o $@ $< +else +list_domains: list_domains.cmo + $(OCAMLC) \ + $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \ + ../libvirt/mllibvirt.cma -o $@ $< + +list_domains.opt: list_domains.cmx + $(OCAMLOPT) \ + $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \ + ../libvirt/mllibvirt.cmxa -o $@ $< +endif install: diff --git a/examples/list_domains.ml b/examples/list_domains.ml index 9451ab2..9451ab2 100644..100755 --- a/examples/list_domains.ml +++ b/examples/list_domains.ml |