summaryrefslogtreecommitdiffstats
path: root/ocaml
diff options
context:
space:
mode:
authorHilko Bengen <bengen@hilluzination.de>2011-08-14 10:58:12 +0200
committerRichard W.M. Jones <rjones@redhat.com>2011-08-15 14:50:33 +0100
commit900c9626b9d4f567b21aae433493b4b3b1d09f6d (patch)
tree60ab4a3ac2374ab551b59d8c7d6f478641993f67 /ocaml
parent36e0f35a5828458ebeaf72999b3461ab66a230d8 (diff)
downloadlibguestfs-900c9626b9d4f567b21aae433493b4b3b1d09f6d.tar.gz
libguestfs-900c9626b9d4f567b21aae433493b4b3b1d09f6d.tar.xz
libguestfs-900c9626b9d4f567b21aae433493b4b3b1d09f6d.zip
out-of-tree build: Fix up OCaml bindings and generator
Diffstat (limited to 'ocaml')
-rw-r--r--ocaml/Makefile.am22
1 files changed, 11 insertions, 11 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 5813f84b..7028fa4a 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -53,16 +53,16 @@ mlguestfs.cmxa: $(XOBJS)
$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
guestfs_c.o: guestfs_c.c
- $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
+ $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $(srcdir)/$<
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: guestfs*.mli guestfs*.ml
+html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml
mkdir -p html
-$(OCAMLDOC) -d html -html $^
endif
@@ -122,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 -linkpkg -c $< -o $@
-
-.mli.cmi:
- $(OCAMLFIND) ocamlc -package unix -c $< -o $@
-.ml.cmo:
- $(OCAMLFIND) ocamlc -package unix -c $< -o $@
-.ml.cmx:
- $(OCAMLFIND) ocamlopt -package unix -c $< -o $@
+ $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $(builddir)/$@
+
+%.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