git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: debug segv correct use of dereferencing NULL.
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
e8ffff0
..
3f33118
100644
(file)
--- a/
resize/Makefile.am
+++ b/
resize/Makefile.am
@@
-13,10
+13,12
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
include $(top_srcdir)/subdir-rules.mk
+SOURCES =
+
EXTRA_DIST = \
$(SOURCES) \
virt-resize.pod \
EXTRA_DIST = \
$(SOURCES) \
virt-resize.pod \
@@
-25,15
+27,15
@@
EXTRA_DIST = \
CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img
if HAVE_OCAML
CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img
if HAVE_OCAML
-if HAVE_OCAML_PCRE
# Alphabetical order.
# Alphabetical order.
-SOURCES = \
+SOURCES
+
= \
progress_c.c \
progress.mli \
progress.ml \
resize.ml \
progress_c.c \
progress.mli \
progress.ml \
resize.ml \
- utils.ml
+ utils.ml \
+ utils_tests.ml
# Note this list must be in dependency order.
OBJECTS = \
# Note this list must be in dependency order.
OBJECTS = \
@@
-48,7
+50,7
@@
bin_SCRIPTS = virt-resize
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
-OCAMLPACKAGES = -package
pcre
-I $(top_builddir)/src/.libs -I ../ocaml
+OCAMLPACKAGES = -package
str
-I $(top_builddir)/src/.libs -I ../ocaml
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@@
-91,6
+93,12
@@
CLEANFILES += stamp-virt-resize.pod
# Tests.
# Tests.
+check_SCRIPTS = utils_tests
+
+utils_tests: utils.cmx utils_tests.cmx
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
+ mlguestfs.cmxa -linkpkg $^ -cclib -lncurses -o $@
+
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
@@
-99,7
+107,7
@@
TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
-TESTS = test-virt-resize.sh
+TESTS = test-virt-resize.sh
utils_tests
# Dependencies.
depend: .depend
# Dependencies.
depend: .depend
@@
-114,11
+122,10
@@
depend: .depend
include .depend
include .depend
-.PHONY: depend docs
-
-endif
endif
endif
+.PHONY: depend docs
+
# Parallel builds don't obey dependencies for some reason we
# don't understand.
.NOTPARALLEL:
# Parallel builds don't obey dependencies for some reason we
# don't understand.
.NOTPARALLEL: