summaryrefslogtreecommitdiffstats
path: root/ocaml
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-10-02 16:09:19 +0200
committerJim Meyering <meyering@redhat.com>2009-10-02 16:15:12 +0200
commitdde81c0c0e4d6517781392310768dfe8fe4392fe (patch)
tree04289c5ac0e5c0107969b31786077f08eede3a9b /ocaml
parent9d25e82491ddcf495e1d30694327e4bfd3a23445 (diff)
downloadlibguestfs-dde81c0c0e4d6517781392310768dfe8fe4392fe.tar.gz
libguestfs-dde81c0c0e4d6517781392310768dfe8fe4392fe.tar.xz
libguestfs-dde81c0c0e4d6517781392310768dfe8fe4392fe.zip
build: fix compile error
Link demo scripts with just-build library, not the installed one. * ocaml/examples/Makefile.am (OCAMLFINDFLAGS): New variable. (lvs, viewer): Use it. This fix is based on a suggestion from Rich Jones. This addresses RHBZ#526917.
Diffstat (limited to 'ocaml')
-rw-r--r--ocaml/examples/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index b516647d..3b9901a3 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -6,15 +6,18 @@ if HAVE_OCAML
noinst_SCRIPTS = lvs
+OCAMLFINDFLAGS = -ccopt '-L $(top_builddir)/src/.libs'
+
lvs: lvs.ml
- $(OCAMLFIND) ocamlopt -warn-error A -I .. mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) \
+ -warn-error A -I .. mlguestfs.cmxa $< -o $@
if BUILD_OCAML_VIEWER
noinst_SCRIPTS += viewer
viewer: throbber.ml xmllight_loader.mli xmllight_loader.ml viewer.ml
- ocamlducefind opt \
+ ocamlducefind opt $(OCAMLFINDFLAGS) \
-warn-error A \
-thread \
-package libvirt,lablgtk2,extlib,xml-light,ocamlduce,threads -I .. \
@@ -30,4 +33,4 @@ throbber.ml: Throbber.png Throbber.gif
endif
-endif \ No newline at end of file
+endif