git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Escape special/non-printing characters in debug output (RHBZ#731744).
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
f3e6aff
..
93a2600
100644
(file)
--- a/
resize/Makefile.am
+++ b/
resize/Makefile.am
@@
-41,7
+41,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)
@@
-64,7
+68,7
@@
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 \
$<
--man virt-resize.1 \
--html $(top_builddir)/html/virt-resize.1.html \
$<
@@
-79,7
+83,8
@@
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 \
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