git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove local LIBGUESTFS_PATH detection from guestfish and guestmount.
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
1d341d8
..
f3e6aff
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,12
+41,12
@@
OBJECTS = \
bin_SCRIPTS = virt-resize
bin_SCRIPTS = virt-resize
-OCAMLPACKAGES = -package
guestfs,pcre
+OCAMLPACKAGES = -package
pcre -I ../ocaml
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
virt-resize: $(OBJECTS)
OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
virt-resize: $(OBJECTS)
- $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -linkpkg $^ -o $@
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS)
mlguestfs.cmxa
-linkpkg $^ -o $@
.mli.cmi:
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
.mli.cmi:
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
@@
-71,6
+70,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)
@@
-98,3
+99,7
@@
include .depend
endif
endif
endif
endif
+
+# Parallel builds don't obey dependencies for some reason we
+# don't understand.
+.NOTPARALLEL: