X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=inline;f=ocaml%2FMakefile.am;h=ee42134b4ab5f244bfc8f7e469afaaa8d5f47596;hb=99f68f259f92eee884c6c7396f61b9c16e2bf354;hp=176bcec9880c11687c5c7934071944d450b1dbb6;hpb=4144e2106cc70ad8f1e081b57da09f9c1e276812;p=libguestfs.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 176bcec..ee42134 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -15,27 +15,30 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-if HAVE_OCAML
-
 EXTRA_DIST = \
 	guestfs.mli guestfs.ml \
-	guestfs_internal.ml \
 	guestfs_c.c guestfs_c.h guestfs_c_actions.c \
 	.depend META.in
 
+SUBDIRS = examples
+
+CLEANFILES = *~
+
+if HAVE_OCAML
+
 noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
 
-mlguestfs.cma: guestfs_c.o guestfs_c_actions.o guestfs_internal.cmo guestfs.cmo
+mlguestfs.cma: guestfs_c.o guestfs_c_actions.o guestfs.cmo
 	$(OCAMLMKLIB) -o mlguestfs $^ -lguestfs
 
-mlguestfs.cmxa: guestfs_c.o guestfs_c_actions.o guestfs_internal.cmx guestfs.cmx
+mlguestfs.cmxa: guestfs_c.o guestfs_c_actions.o guestfs.cmx
 	$(OCAMLMKLIB) -o mlguestfs $^ -lguestfs
 
 guestfs_c.o: guestfs_c.c
-	$(CC) $(CFLAGS) -I$(OCAMLLIB) -c $<
+	$(CC) $(CFLAGS) -I$(OCAMLLIB) -I$(top_builddir)/src -fPIC -Wall -c $<
 
 guestfs_c_actions.o: guestfs_c_actions.c
-	$(CC) $(CFLAGS) -I$(OCAMLLIB) -c $<
+	$(CC) $(CFLAGS) -I$(OCAMLLIB) -I$(top_builddir)/src -fPIC -Wall -c $<
 
 .mli.cmi:
 	$(OCAMLFIND) ocamlc -c $<
@@ -56,7 +59,11 @@ SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
 
 # Do the installation by hand, because we want to run ocamlfind.
 install-data-hook:
-	$(OCAMLFIND) install -destdir $(DESTDIR) guestfs \
+	mkdir -p $(DESTDIR)$(OCAMLLIB)
+	mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
+	$(OCAMLFIND) install \
+	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
+	  guestfs \
 	  META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
 
 endif
\ No newline at end of file