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 /Makefile.in | |
| 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 'Makefile.in')
| -rwxr-xr-x[-rw-r--r--] | Makefile.in | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in index bd791fc..703d14e 100644..100755 --- a/Makefile.in +++ b/Makefile.in @@ -20,30 +20,10 @@ VERSION = @PACKAGE_VERSION@ INSTALL = @INSTALL@ -pkg_extlib = @pkg_extlib@ -pkg_lablgtk2 = @pkg_lablgtk2@ -pkg_curses = @pkg_curses@ -pkg_xml_light = @pkg_xml_light@ - +OCAMLDOC = @OCAMLDOC@ OCAMLDOCFLAGS := -html -sort -SUBDIRS := libvirt examples - -ifeq ($(pkg_extlib),yes) -SUBDIRS += mlvirsh -endif - -ifeq ($(pkg_lablgtk2),yes) -SUBDIRS += mlvirtmanager -endif - -ifeq ($(pkg_extlib)$(pkg_curses),yesyes) -SUBDIRS += virt-top -endif - -ifeq ($(pkg_extlib)$(pkg_xml_light),yesyes) -SUBDIRS += virt-df -endif +SUBDIRS = @subdirs@ all opt depend install: for d in $(SUBDIRS); do \ @@ -53,7 +33,7 @@ all opt depend install: clean: for d in . $(SUBDIRS); do \ - (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ core); \ + (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll core); \ done rm -f examples/list_domains rm -f mlvirsh/mlvirsh @@ -76,12 +56,14 @@ distclean: clean # Developer documentation (in html/ subdirectory). +ifneq ($(OCAMLDOC),) doc: rm -rf html mkdir html -cd libvirt; \ - ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d ../html \ + $(OCAMLDOC) $(OCAMLDOCFLAGS) -d ../html \ libvirt.{ml,mli} libvirt_version.{ml,mli} +endif # Update configure and rerun. |