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
032a551
..
8daa671
100644
(file)
--- a/
ocaml/Makefile.am
+++ b/
ocaml/Makefile.am
@@
-15,12
+15,20
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = \
+ guestfs.mli \
+ guestfs.ml \
+ guestfs_c_actions.c \
+ bindtests.ml
+
EXTRA_DIST = \
EXTRA_DIST = \
-
guestfs.mli guestfs.ml
\
-
guestfs_c.c guestfs_c.h guestfs_c_actions.c
\
- guestfs_
inspector.mli guestfs_inspector.ml
\
-
.depend META.in
\
-
bindtests.ml
\
+
$(generator_built)
\
+
.depend
\
+ guestfs_
c.c guestfs_c.h
\
+
html/.gitignore
\
+
META.in
\
run-bindtests \
t/*.ml
run-bindtests \
t/*.ml
@@
-32,11
+40,10
@@
AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
if HAVE_OCAML
$(WARN_CFLAGS) $(WERROR_CFLAGS)
if HAVE_OCAML
-if HAVE_XML_LIGHT
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
-OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo
guestfs_inspector.cmo
+OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo
XOBJS = $(OBJS:.cmo=.cmx)
mlguestfs.cma: $(OBJS)
XOBJS = $(OBJS:.cmo=.cmx)
mlguestfs.cma: $(OBJS)
@@
-49,61
+56,86
@@
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 \
- t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
- t/guestfs_060_readdir t/guestfs_500_inspect
+ t/guestfs_005_load \
+ t/guestfs_010_basic \
+ t/guestfs_070_threads \
+ t/guestfs_080_optargs \
+ t/guestfs_400_events \
+ t/guestfs_400_progress
noinst_DATA += bindtests \
noinst_DATA += bindtests \
- t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
- t/guestfs_060_readdir t/guestfs_500_inspect
+ t/guestfs_005_load \
+ t/guestfs_010_basic \
+ t/guestfs_070_threads \
+ t/guestfs_080_optargs \
+ t/guestfs_400_events \
+ t/guestfs_400_progress
bindtests: bindtests.cmx mlguestfs.cmxa
mkdir -p t
bindtests: bindtests.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
xml-light,
unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
mkdir -p t
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+
+t/guestfs_010_basic: t/guestfs_010_basic.cmx mlguestfs.cmxa
+ mkdir -p t
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
-t/guestfs_0
10_launch: t/guestfs_010_launch
.cmx mlguestfs.cmxa
+t/guestfs_0
70_threads: t/guestfs_070_threads
.cmx mlguestfs.cmxa
mkdir -p t
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
xml-light,unix
-linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
unix,threads -thread
-linkpkg mlguestfs.cmxa $< -o $@
-t/guestfs_0
50_lvcreate: t/guestfs_050_lvcreate
.cmx mlguestfs.cmxa
+t/guestfs_0
80_optargs: t/guestfs_080_optargs
.cmx mlguestfs.cmxa
mkdir -p t
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
xml-light,
unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
-t/guestfs_
060_readdir: t/guestfs_060_readdir
.cmx mlguestfs.cmxa
+t/guestfs_
400_events: t/guestfs_400_events
.cmx mlguestfs.cmxa
mkdir -p t
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
xml-light,
unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
-t/guestfs_
500_inspect: t/guestfs_500_inspect
.cmx mlguestfs.cmxa
+t/guestfs_
400_progress: t/guestfs_400_progress
.cmx mlguestfs.cmxa
mkdir -p t
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package
xml-light,
unix -linkpkg mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
# Need to rebuild the tests from source if the main library has
# changed at all, otherwise we get inconsistent assumptions.
# Need to rebuild the tests from source if the main library has
# changed at all, otherwise we get inconsistent assumptions.
+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
t/%.cmx: t/%.ml mlguestfs.cmxa
- $(OCAMLFIND) ocamlopt -package
xml-light,unix -linkpkg -c $< -o
$@
+ $(OCAMLFIND) ocamlopt -package
unix -linkpkg -c $< -o $(builddir)/
$@
-.mli.cmi:
- $(OCAMLFIND) ocamlc -package
xml-light,unix -c $< -o
$@
-.ml.cmo:
- $(OCAMLFIND) ocamlc -package
xml-light,unix -c $< -o
$@
-.ml.cmx:
- $(OCAMLFIND) ocamlopt -package
xml-light,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: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
- $(OCAMLFIND) ocamldep $^ | sed 's/ *$$//' > $@-t
+ $(OCAMLFIND) ocamldep $^ | sed 's/ *$$//'
| sort
> $@-t
mv $@-t $@
include .depend
mv $@-t $@
include .depend
@@
-117,12
+149,11
@@
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)
endif
CLEANFILES += $(noinst_DATA)
endif
-endif
# Tell version 3.79 and up of GNU make to not build goals in this
# directory in parallel. (Possible solution for RHBZ#502309).
# Tell version 3.79 and up of GNU make to not build goals in this
# directory in parallel. (Possible solution for RHBZ#502309).