mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
Hi Rich,
I realized a day or two late that my suggestion was not quite right.
Here's the fix:
>From 5294c21cf07c4ec2f094182ba9f32696f3de2751 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 23 Jan 2012 10:01:40 +0100
Subject: [PATCH libguestfs] build: don't use automake-internal variable
* ocaml/Makefile.am (mlguestfs.cma): Use the documented variable form,
$(libguestfsocaml_a_OBJECTS), not the $(am_libguestfsocaml_a_OBJECTS)
that I suggested for commit 1.15.16-17-g8b9eaec.
(cherry picked from commit 70070cf244)
171 lines
5.5 KiB
Makefile
171 lines
5.5 KiB
Makefile
# libguestfs OCaml bindings
|
|
# Copyright (C) 2009 Red Hat Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
include $(top_srcdir)/subdir-rules.mk
|
|
|
|
generator_built = \
|
|
guestfs.mli \
|
|
guestfs.ml \
|
|
guestfs_c_actions.c \
|
|
bindtests.ml
|
|
|
|
EXTRA_DIST = \
|
|
$(generator_built) \
|
|
.depend \
|
|
guestfs_c.c guestfs_c.h \
|
|
html/.gitignore \
|
|
META.in \
|
|
run-bindtests \
|
|
t/*.ml
|
|
|
|
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
|
|
CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
|
|
|
|
if HAVE_OCAML
|
|
|
|
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX
|
|
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
|
|
|
|
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
|
|
|
|
# Build the C part into a library, so that automake handles the C
|
|
# compilation step for us. Note that we don't directly use this
|
|
# library; we link with the object files that it generates.
|
|
noinst_LIBRARIES = libguestfsocaml.a
|
|
|
|
mlguestfs.cma: libguestfsocaml.a guestfs.cmo
|
|
$(OCAMLMKLIB) -o mlguestfs \
|
|
$(libguestfsocaml_a_OBJECTS) guestfs.cmo \
|
|
-L$(top_builddir)/src/.libs -lguestfs
|
|
|
|
mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx
|
|
$(OCAMLMKLIB) -o mlguestfs \
|
|
$(libguestfsocaml_a_OBJECTS) guestfs.cmx \
|
|
-L$(top_builddir)/src/.libs -lguestfs
|
|
|
|
libguestfsocaml_a_CFLAGS = \
|
|
-I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
|
|
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
|
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
|
-fPIC
|
|
libguestfsocaml_a_SOURCES = guestfs_c.c guestfs_c_actions.c
|
|
|
|
if HAVE_OCAMLDOC
|
|
|
|
noinst_DATA += html/index.html
|
|
|
|
html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml
|
|
mkdir -p html
|
|
-$(OCAMLDOC) -d html -html $^
|
|
endif
|
|
|
|
TESTS_ENVIRONMENT = \
|
|
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
|
|
LIBGUESTFS_PATH=$(top_builddir)/appliance \
|
|
TMPDIR=$(top_builddir) \
|
|
$(VG)
|
|
|
|
TESTS = run-bindtests \
|
|
t/guestfs_005_load \
|
|
t/guestfs_010_basic \
|
|
t/guestfs_070_threads \
|
|
t/guestfs_080_optargs \
|
|
t/guestfs_400_events \
|
|
t/guestfs_400_progress
|
|
noinst_DATA += bindtests \
|
|
t/guestfs_005_load \
|
|
t/guestfs_010_basic \
|
|
t/guestfs_070_threads \
|
|
t/guestfs_080_optargs \
|
|
t/guestfs_400_events \
|
|
t/guestfs_400_progress
|
|
|
|
bindtests: bindtests.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_010_basic: t/guestfs_010_basic.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_080_optargs: t/guestfs_080_optargs.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_400_events: t/guestfs_400_events.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
|
|
|
|
t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa
|
|
mkdir -p t
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package 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/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@
|
|
|
|
t/%.cmx: t/%.ml mlguestfs.cmxa
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -linkpkg -c $< -o $(builddir)/$@
|
|
|
|
%.cmi: %.mli
|
|
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
|
|
%.cmo: %.ml
|
|
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
|
|
%.cmx: %.ml
|
|
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $(builddir)/$@
|
|
|
|
depend: .depend
|
|
|
|
.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
|
|
rm -f $@ $@-t
|
|
$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) $^ | \
|
|
$(SED) 's/ *$$//' | \
|
|
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
|
|
$(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
|
|
sort > $@-t
|
|
mv $@-t $@
|
|
|
|
-include .depend
|
|
|
|
SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
|
|
|
|
# Do the installation by hand, because we want to run ocamlfind.
|
|
install-data-hook:
|
|
mkdir -p $(DESTDIR)$(OCAMLLIB)
|
|
mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
|
|
$(OCAMLFIND) install \
|
|
-ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
|
|
guestfs \
|
|
META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli
|
|
|
|
CLEANFILES += $(noinst_DATA)
|
|
|
|
endif
|
|
|
|
# Tell version 3.79 and up of GNU make to not build goals in this
|
|
# directory in parallel. (Possible solution for RHBZ#502309).
|
|
.NOTPARALLEL:
|