git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change network configuration to use macros.
[libguestfs.git]
/
ocaml
/
Makefile.am
diff --git
a/ocaml/Makefile.am
b/ocaml/Makefile.am
index
c89296b
..
38238f6
100644
(file)
--- a/
ocaml/Makefile.am
+++ b/
ocaml/Makefile.am
@@
-15,11
+15,21
@@
# 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_inspector.mli \
+ guestfs_inspector.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 \
+ $(generator_built) \
+ guestfs_c.c guestfs_c.h \
+ guestfs_inspector.mli guestfs_inspector.ml \
.depend META.in \
.depend META.in \
- bindtests.ml \
run-bindtests \
t/*.ml
run-bindtests \
t/*.ml
@@
-31,13
+41,17
@@
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
-mlguestfs.cma: guestfs_c.o guestfs_c_actions.o guestfs.cmo
+OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo guestfs_inspector.cmo
+XOBJS = $(OBJS:.cmo=.cmx)
+
+mlguestfs.cma: $(OBJS)
$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
-mlguestfs.cmxa:
guestfs_c.o guestfs_c_actions.o guestfs.cmx
+mlguestfs.cmxa:
$(XOBJS)
$(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
@@
-53,48
+67,52
@@
TESTS_ENVIRONMENT = \
TESTS = run-bindtests \
t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
TESTS = run-bindtests \
t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
- t/guestfs_060_readdir
+ t/guestfs_060_readdir
t/guestfs_500_inspect
noinst_DATA += bindtests \
t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
noinst_DATA += bindtests \
t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
- t/guestfs_060_readdir
+ t/guestfs_060_readdir
t/guestfs_500_inspect
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 .
unix.cmxa
mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
-package xml-light,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 .
unix.cmxa
mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
-package xml-light,unix -linkpkg
mlguestfs.cmxa $< -o $@
t/guestfs_010_launch: t/guestfs_010_launch.cmx mlguestfs.cmxa
mkdir -p t
t/guestfs_010_launch: t/guestfs_010_launch.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
unix.cmxa
mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
-package xml-light,unix -linkpkg
mlguestfs.cmxa $< -o $@
t/guestfs_050_lvcreate: t/guestfs_050_lvcreate.cmx mlguestfs.cmxa
mkdir -p t
t/guestfs_050_lvcreate: t/guestfs_050_lvcreate.cmx mlguestfs.cmxa
mkdir -p t
- $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
unix.cmxa
mlguestfs.cmxa $< -o $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I .
-package xml-light,unix -linkpkg
mlguestfs.cmxa $< -o $@
t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
mkdir -p t
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 $@
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@
+
+t/guestfs_500_inspect: t/guestfs_500_inspect.cmx mlguestfs.cmxa
+ mkdir -p t
+ $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,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.
t/%.cmx: t/%.ml mlguestfs.cmxa
# 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 $@
+ $(OCAMLFIND) ocamlopt -
package xml-light,unix -linkpkg -
c $< -o $@
.mli.cmi:
.mli.cmi:
- $(OCAMLFIND) ocamlc -c $< -o $@
+ $(OCAMLFIND) ocamlc -
package xml-light,unix -
c $< -o $@
.ml.cmo:
.ml.cmo:
- $(OCAMLFIND) ocamlc -c $< -o $@
+ $(OCAMLFIND) ocamlc -
package xml-light,unix -
c $< -o $@
.ml.cmx:
.ml.cmx:
- $(OCAMLFIND) ocamlopt -c $< -o $@
+ $(OCAMLFIND) ocamlopt -
package xml-light,unix -
c $< -o $@
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
@@
-113,6
+131,7
@@
install-data-hook:
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).