git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security: Mitigate possible privilege escalation via SG_IO ioctl (CVE-2011-4127,...
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
3740a4a
..
c5d68e7
100644
(file)
--- a/
resize/Makefile.am
+++ b/
resize/Makefile.am
@@
-19,7
+19,6
@@
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \
$(SOURCES) \
EXTRA_DIST = \
$(SOURCES) \
- run-resize-locally \
virt-resize.pod \
test-virt-resize.sh
virt-resize.pod \
test-virt-resize.sh
@@
-32,7
+31,8
@@
if HAVE_OCAML_PCRE
SOURCES = \
progress.ml \
resize.ml \
SOURCES = \
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 = \
@@
-42,7
+42,11
@@
OBJECTS = \
bin_SCRIPTS = virt-resize
bin_SCRIPTS = virt-resize
-OCAMLPACKAGES = -package pcre -I ../ocaml
+# -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
+
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
@@
-65,29
+69,39
@@
noinst_DATA = $(top_builddir)/html/virt-resize.1.html
virt-resize.1 $(top_builddir)/html/virt-resize.1.html: stamp-virt-resize.pod
stamp-virt-resize.pod: virt-resize.pod
virt-resize.1 $(top_builddir)/html/virt-resize.1.html: stamp-virt-resize.pod
stamp-virt-resize.pod: virt-resize.pod
- $(top_
src
dir)/podwrapper.sh \
+ $(top_
build
dir)/podwrapper.sh \
--man virt-resize.1 \
--html $(top_builddir)/html/virt-resize.1.html \
$<
touch $@
--man virt-resize.1 \
--html $(top_builddir)/html/virt-resize.1.html \
$<
touch $@
+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 = \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
-TESTS = test-virt-resize.sh
+TESTS = test-virt-resize.sh
utils_tests
# Dependencies.
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
# Dependencies.
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
- $(OCAMLFIND) ocamldep $(OCAMLPACKAGES) $^ | \
+ $(OCAMLFIND) ocamldep -I ../ocaml $^ | \
+ $(SED) 's/ *$$//' | \
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
sort > $@-t
mv $@-t $@
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
sort > $@-t
mv $@-t $@
@@
-98,3
+112,7
@@
include .depend
endif
endif
endif
endif
+
+# Parallel builds don't obey dependencies for some reason we
+# don't understand.
+.NOTPARALLEL: