git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test_qemu: pclose may return any != 0 on error.
[libguestfs.git]
/
ocaml
/
Makefile.am
diff --git
a/ocaml/Makefile.am
b/ocaml/Makefile.am
index
c07b9c5
..
8daa671
100644
(file)
--- a/
ocaml/Makefile.am
+++ b/
ocaml/Makefile.am
@@
-25,8
+25,10
@@
generator_built = \
EXTRA_DIST = \
$(generator_built) \
EXTRA_DIST = \
$(generator_built) \
+ .depend \
guestfs_c.c guestfs_c.h \
guestfs_c.c guestfs_c.h \
- .depend META.in \
+ html/.gitignore \
+ META.in \
run-bindtests \
t/*.ml
run-bindtests \
t/*.ml
@@
-54,11
+56,21
@@
guestfs_c.o: guestfs_c.c
$(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
guestfs_c_actions.o: guestfs_c_actions.c
$(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
guestfs_c_actions.o: guestfs_c_actions.c
- $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
+ $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $(srcdir)/$<
+
+if HAVE_OCAMLDOC
+
+noinst_DATA += html/index.html
+
+html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml
+ mkdir -p html
+ -$(OCAMLDOC) -d html -html $^
+endif
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir) \
$(VG)
TESTS = run-bindtests \
$(VG)
TESTS = run-bindtests \
@@
-110,14
+122,14
@@
t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa
$(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@
t/%.cmx: t/%.ml mlguestfs.cmxa
$(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@
t/%.cmx: t/%.ml mlguestfs.cmxa
- $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $@
+ $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $
(builddir)/$
@
-.mli.cmi:
- $(OCAMLFIND) ocamlc -package unix -c $< -o $@
-.ml.cmo:
- $(OCAMLFIND) ocamlc -package unix -c $< -o $@
-.ml.cmx:
- $(OCAMLFIND) ocamlopt -package unix -c $< -o $@
+%.cmi: %.mli
+ $(OCAMLFIND) ocamlc -package unix -c $< -o $
(builddir)/$
@
+%.cmo: %.ml
+ $(OCAMLFIND) ocamlc -package unix -c $< -o $
(builddir)/$
@
+%.cmx: %.ml
+ $(OCAMLFIND) ocamlopt -package unix -c $< -o $
(builddir)/$
@
depend: .depend
depend: .depend
@@
-137,7
+149,7
@@
install-data-hook:
$(OCAMLFIND) install \
-ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
guestfs \
$(OCAMLFIND) install \
-ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
guestfs \
- META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
+ META *.so *.a *.cma *.cmx *.cmxa *.cmi
$(srcdir)/
*.mli
CLEANFILES += $(noinst_DATA)
CLEANFILES += $(noinst_DATA)