X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=80ea875678e1d96c72953459161c0fc302a5b93f;hp=c0c2ebbef580d167691c90dc61d7475ef6bc6633;hb=d43dac69483e8ec62e8356d93f761684ce2f5cc8;hpb=b86d7b975629ae099ad9a137ced6f23b17c1531a
diff --git a/Makefile.am b/Makefile.am
index c0c2ebb..80ea875 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,12 @@ 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 \
@@ -49,7 +55,10 @@ EXTRA_DIST = \
recipes/README \
recipes/*.html \
recipes/*.sh \
- recipes/*.example
+ recipes/*.example \
+ html/recipes.css \
+ make-recipes.sh \
+ test-cleanup.sh
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
@@ -68,13 +77,16 @@ $(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
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 $@
- bash $(builddir)/update-initramfs.sh
+ bash $(top_builddir)/update-initramfs.sh
touch $@
+make-initramfs.sh: make-initramfs.sh.in
+ ./config.status $@
+
# Tests. These are auto-generated from the test descriptions.
check_PROGRAMS = tests
@@ -85,9 +97,15 @@ tests_CFLAGS = \
tests_LDADD = $(top_builddir)/src/libguestfs.la
TESTS = $(check_PROGRAMS)
+TESTS_ENVIRONMENT = $(VG)
$(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.
@@ -141,38 +159,16 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
--outfile $@
# Recipes web page.
-html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
rm -f $@ $@-t
- echo 'guestfish recipes' >> $@-t; \
- echo '' >> $@-t; \
- echo '' >> $@-t; \
- echo '' >> $@-t; \
- echo '' >> $@-t; \
- echo 'guestfish recipes
' >> $@-t; \
- echo 'You can also find these in the recipes/ subdirectory of the source.
' >> $@-t; \
- for f in recipes/*.sh; do \
- b=`basename $$f .sh`; \
- echo -n '' >> $@-t; \
- if [ -r recipes/$$b.html ]; then \
- cat recipes/$$b.html >> $@-t; \
- else \
- echo '$$b
' >> $@-t; \
- fi; \
- echo '' >> $@-t; \
- sed -e 's,&,\&,g' -e 's,<,\<,g' -e 's,>,\>,g' < $$f >> $@-t; \
- echo '
' >> $@-t; \
- if [ -r recipes/$$b.example ]; then \
- echo 'Example output
' >> $@-t; \
- echo '' >> $@-t; \
- sed -e 's,&,\&,g' -e 's,<,\<,g' -e 's,>,\>,g' < recipes/$$b.example >> $@-t; \
- echo '
' >> $@-t; \
- fi; \
- done; \
- echo '' >> $@-t; \
+ sh make-recipes.sh recipes/*.sh > $@-t
mv $@-t $@
-website: html/guestfs.3.html html/guestfish.1.html html/recipes.html
- cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
+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/
# Generate the ChangeLog automatically from the gitlog.
@@ -211,11 +207,11 @@ test-boot-realistic: emptydisk
-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.
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
clean-local:
rm -rf initramfs