git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Perl bindings fix: Not enough memory was allocated for array params.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
b4df8a8
..
80ea875
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-34,6
+34,12
@@
endif
if HAVE_JAVA
SUBDIRS += java
endif
if HAVE_JAVA
SUBDIRS += java
endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
EXTRA_DIST = \
make-initramfs.sh update-initramfs.sh \
EXTRA_DIST = \
make-initramfs.sh update-initramfs.sh \
@@
-51,7
+57,8
@@
EXTRA_DIST = \
recipes/*.sh \
recipes/*.example \
html/recipes.css \
recipes/*.sh \
recipes/*.example \
html/recipes.css \
- make-recipes.sh
+ make-recipes.sh \
+ test-cleanup.sh
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
@@
-70,13
+77,16
@@
$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
initramfs/fakeroot.log: make-initramfs.sh.in
-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-mv $(VMLINUZ) $(VMLINUZ).bak
initramfs/fakeroot.log: make-initramfs.sh.in
-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-mv $(VMLINUZ) $(VMLINUZ).bak
- if ! bash $(builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
+ if ! bash $(
top_
builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
rm -f $@
$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
rm -f $@
- bash $(builddir)/update-initramfs.sh
+ bash $(
top_
builddir)/update-initramfs.sh
touch $@
touch $@
+make-initramfs.sh: make-initramfs.sh.in
+ ./config.status $@
+
# Tests. These are auto-generated from the test descriptions.
check_PROGRAMS = tests
# Tests. These are auto-generated from the test descriptions.
check_PROGRAMS = tests
@@
-87,9
+97,15
@@
tests_CFLAGS = \
tests_LDADD = $(top_builddir)/src/libguestfs.la
TESTS = $(check_PROGRAMS)
tests_LDADD = $(top_builddir)/src/libguestfs.la
TESTS = $(check_PROGRAMS)
+TESTS_ENVIRONMENT = $(VG)
$(TESTS): $(INITRAMFS) $(VMLINUZ)
$(TESTS): $(INITRAMFS) $(VMLINUZ)
+# Run the tests under valgrind.
+
+valgrind:
+ $(MAKE) check VG="valgrind --quiet --leak-check=full"
+
# Manual pages.
# guestfs-actions.pod and guestfs-structs are autogenerated. There is
# no include mechanism for POD, so we have to do it by hand.
# Manual pages.
# guestfs-actions.pod and guestfs-structs are autogenerated. There is
# no include mechanism for POD, so we have to do it by hand.
@@
-148,7
+164,9
@@
html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
sh make-recipes.sh recipes/*.sh > $@-t
mv $@-t $@
sh make-recipes.sh recipes/*.sh > $@-t
mv $@-t $@
-website: html/guestfs.3.html html/guestfish.1.html html/recipes.html
+website: html/guestfs.3.html html/guestfish.1.html \
+ html/virt-inspector.1.html \
+ html/recipes.html
cp $^ html/pod.css html/recipes.css \
$(HOME)/d/redhat/et-website/libguestfs/
cp $^ html/pod.css html/recipes.css \
$(HOME)/d/redhat/et-website/libguestfs/
@@
-189,11
+207,11
@@
test-boot-realistic: emptydisk
-serial stdio \
-net channel,6666:unix:/tmp/sock,server,nowait \
-net user,vlan=0 \
-serial stdio \
-net channel,6666:unix:/tmp/sock,server,nowait \
-net user,vlan=0 \
- -net nic,vlan=0
+ -net nic,
model=virtio,
vlan=0
# Make clean.
# Make clean.
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
*~ html/*~ recipes/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
clean-local:
rm -rf initramfs
clean-local:
rm -rf initramfs