git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
3740a4a
..
fd7f71a
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
@@
-42,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)
@@
-71,6
+74,8
@@
stamp-virt-resize.pod: virt-resize.pod
$<
touch $@
$<
touch $@
+CLEANFILES += stamp-virt-resize.pod
+
# Tests.
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
# Tests.
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
@@
-78,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
@@
-98,3
+104,7
@@
include .depend
endif
endif
endif
endif
+
+# Parallel builds don't obey dependencies for some reason we
+# don't understand.
+.NOTPARALLEL: