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 the specfile from the tarball. Include contrib/ dir.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
68934b9
..
592ed94
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-34,6
+34,9
@@
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
if HAVE_INSPECTOR
SUBDIRS += inspector
endif
@@
-42,7
+45,6
@@
EXTRA_DIST = \
make-initramfs.sh update-initramfs.sh \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
guestfish.pod guestfish-actions.pod \
make-initramfs.sh update-initramfs.sh \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
guestfish.pod guestfish-actions.pod \
- libguestfs.spec \
html/pod.css \
HACKING TODO \
tests.c \
html/pod.css \
HACKING TODO \
tests.c \
@@
-54,7
+56,14
@@
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 \
+ contrib/README \
+ contrib/centos5.3-libguestfs.spec \
+ contrib/fedora-libguestfs.spec \
+ contrib/febootstrap/install.title \
+ contrib/febootstrap/install.html \
+ contrib/febootstrap/install.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
@@
-80,7
+89,11
@@
$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
bash $(top_builddir)/update-initramfs.sh
touch $@
bash $(top_builddir)/update-initramfs.sh
touch $@
-# Tests. These are auto-generated from the test descriptions.
+make-initramfs.sh: make-initramfs.sh.in
+ ./config.status $@
+
+# Tests. These are auto-generated from the test descriptions
+# in the generator.
check_PROGRAMS = tests
check_PROGRAMS = tests
@@
-90,9
+103,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.
@@
-151,7
+170,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/
@@
-192,11
+213,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