git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator.ml: suppress signed/unsigned-compare warnings
[libguestfs.git]
/
ocaml
/
Makefile.am
diff --git
a/ocaml/Makefile.am
b/ocaml/Makefile.am
index
c7d43a0
..
d65ebaa
100644
(file)
--- a/
ocaml/Makefile.am
+++ b/
ocaml/Makefile.am
@@
-28,6
+28,9
@@
SUBDIRS = examples
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
+AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+ -I$(top_srcdir)/src -I$(top_builddir)/src
+
if HAVE_OCAML
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
if HAVE_OCAML
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
@@
-39,10
+42,10
@@
mlguestfs.cmxa: guestfs_c.o guestfs_c_actions.o guestfs.cmx
$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
guestfs_c.o: guestfs_c.c
$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
guestfs_c.o: guestfs_c.c
- $(CC) $(
CFLAGS) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml -I$(top_srcdir)/src -I$(top_builddir)/src
-fPIC -Wall -c $<
+ $(CC) $(
AM_CPPFLAGS) $(CFLAGS)
-fPIC -Wall -c $<
guestfs_c_actions.o: guestfs_c_actions.c
guestfs_c_actions.o: guestfs_c_actions.c
- $(CC) $(
CFLAGS) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml -I$(top_srcdir)/src -I$(top_builddir)/src
-fPIC -Wall -c $<
+ $(CC) $(
AM_CPPFLAGS) $(CFLAGS)
-fPIC -Wall -c $<
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
@@
-57,6
+60,7
@@
noinst_DATA += bindtests \
t/guestfs_060_readdir
bindtests: bindtests.cmx mlguestfs.cmxa
t/guestfs_060_readdir
bindtests: bindtests.cmx mlguestfs.cmxa
+ mkdir -p t
$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
@@
-75,6
+79,11
@@
t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
mkdir -p t
$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
mkdir -p t
$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+# Need to rebuild the tests from source if the main library has
+# changed at all, otherwise we get inconsistent assumptions.
+t/%.cmx: t/%.ml mlguestfs.cmxa
+ $(OCAMLFIND) ocamlopt -c $< -o $@
+
.mli.cmi:
$(OCAMLFIND) ocamlc -c $< -o $@
.ml.cmo:
.mli.cmi:
$(OCAMLFIND) ocamlc -c $< -o $@
.ml.cmo:
@@
-85,8
+94,9
@@
t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
- rm -f .depend
- $(OCAMLFIND) ocamldep $^ > $@
+ rm -f $@ $@-t
+ $(OCAMLFIND) ocamldep $^ | sed 's/ *$$//' > $@-t
+ mv $@-t $@
include .depend
include .depend