X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=c4a84f788f960b4a124b0416aa0b265ba452d5d5;hp=80ea875678e1d96c72953459161c0fc302a5b93f;hb=854f8e0d5643e55d045f5816a520d49a057990ef;hpb=d43dac69483e8ec62e8356d93f761684ce2f5cc8 diff --git a/Makefile.am b/Makefile.am index 80ea875..c4a84f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,14 +17,21 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src daemon fish examples images +SUBDIRS = gnulib/lib src daemon appliance fish po examples images \ + gnulib/tests capitests regressions test-tool -if HAVE_OCAML -SUBDIRS += ocaml -endif +# NB: Must build inspector directory after perl and before ocaml. +# We could relax this if we combined the inspector_generator with +# the ordinary generator, but that brings other problems. if HAVE_PERL SUBDIRS += perl endif +if HAVE_INSPECTOR +SUBDIRS += inspector +endif +if HAVE_OCAML +SUBDIRS += ocaml ocaml/examples +endif if HAVE_PYTHON SUBDIRS += python endif @@ -37,20 +44,25 @@ endif if HAVE_HASKELL SUBDIRS += haskell endif -if HAVE_INSPECTOR -SUBDIRS += inspector +if HAVE_DF +SUBDIRS += df +endif +if HAVE_CAT +SUBDIRS += cat +endif +if HAVE_RESCUE +SUBDIRS += rescue +endif +if HAVE_EDIT +SUBDIRS += edit endif EXTRA_DIST = \ - 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 \ libguestfs.pc libguestfs.pc.in \ - gitlog-to-changelog \ recipes/LICENSE \ recipes/README \ recipes/*.html \ @@ -58,59 +70,18 @@ EXTRA_DIST = \ 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 -# $(libdir) is best. When we build cross-architecture filesystems we -# should probably move them to $(datadir). - -fsdir = $(libdir)/guestfs - -INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img -VMLINUZ = vmlinuz.$(REPO).$(host_cpu) - -fs_DATA = $(INITRAMFSIMG) $(VMLINUZ) - -$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log - -initramfs/fakeroot.log: make-initramfs.sh.in - -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak - -mv $(VMLINUZ) $(VMLINUZ).bak - if ! bash $(top_builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi - -$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd - rm -f $@ - 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 - -tests_SOURCES = tests.c -tests_CFLAGS = \ - -I$(top_builddir)/src -Wall -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" + contrib/README \ + contrib/febootstrap/install.title \ + contrib/febootstrap/install.html \ + contrib/febootstrap/install.sh \ + bindtests \ + libguestfs.3 # 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. -man_MANS = guestfs.3 guestfish.1 +man_MANS = guestfs.3 libguestfs.3 guestfish.1 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod sed \ @@ -138,6 +109,7 @@ guestfish.1: guestfish.pod guestfish-actions.pod noinst_DATA = html/guestfs.3.html html/guestfish.1.html html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod + mkdir -p html sed \ -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \ -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \ @@ -149,6 +121,7 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod --outfile $@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod + mkdir -p html sed \ -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \ < $< | \ @@ -160,58 +133,73 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod # Recipes web page. html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh + mkdir -p html rm -f $@ $@-t sh make-recipes.sh recipes/*.sh > $@-t mv $@-t $@ -website: html/guestfs.3.html html/guestfish.1.html \ +HTMLFILES = html/guestfs.3.html html/guestfish.1.html \ + html/virt-cat.1.html \ + html/virt-df.1.html \ + html/virt-edit.1.html \ html/virt-inspector.1.html \ - html/recipes.html - cp $^ html/pod.css html/recipes.css \ - $(HOME)/d/redhat/et-website/libguestfs/ + html/virt-rescue.1.html \ + html/recipes.html \ + html/pod.css html/recipes.css + +TEXTFILES = README TODO HACKING + +WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs + +website: $(HTMLFILES) $(TEXTFILES) + cp $(HTMLFILES) $(WEBSITEDIR) + for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done + cd $(WEBSITEDIR) && \ + date=`date +%F`; \ + sed -e "s/SUBST_VERSION/$(VERSION)/" \ + -e "s/SUBST_DATE/$$date/" \ + < index.html.in > index.html # Generate the ChangeLog automatically from the gitlog. dist-hook: - ./gitlog-to-changelog > ChangeLog + $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog +# Update the list of translatable files in po/POTFILES.in. +all-local: + cd $(srcdir); \ + find $(DIST_SUBDIRS) \ + -name '*.c' -o -name '*.pl' -o -name '*.pm' -o \ + -name 'virt-cat' -o \ + -name 'virt-df' -o \ + -name 'virt-edit' -o \ + -name 'virt-inspector' -o \ + -name 'virt-rescue' | \ + grep -v '^perl/blib/' | \ + grep -v '^capitests/' | \ + grep -v '^daemon/lib/' | \ + grep -v '^daemon/tests/' | \ + grep -v '^examples/' | \ + grep -v '^gnulib/' | \ + grep -v '^perl/examples/' | \ + grep -v '/guestfs_protocol.c' | \ + grep -v '/rc_protocol.c' | \ + LC_ALL=C sort | \ + sed 's,^\./,,' > po/POTFILES.in + # Pkgconfig. pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libguestfs.pc -# Test-boot the image. - -test-boot: emptydisk - qemu-system-$(host_cpu) \ - -m 384 \ - -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \ - -hda emptydisk - -emptydisk: - rm -f emptydisk - dd if=/dev/zero of=emptydisk bs=1024 count=1440 - echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null - -# This is a more realistic test boot command line which better -# reflects what the library does. - -test-boot-realistic: emptydisk - qemu-system-$(host_cpu) \ - -m 384 \ - -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \ - -hda emptydisk \ - -append "console=ttyS0 guestfs=10.0.2.4:6666" \ - -nographic \ - -serial stdio \ - -net channel,6666:unix:/tmp/sock,server,nowait \ - -net user,vlan=0 \ - -net nic,model=virtio,vlan=0 - # Make clean. -CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp +CLEANFILES = $(fs_DATA) \ + emptydisk \ + pod2htm?.tmp \ + html/*.html \ + guestfs.3 guestfish.1 clean-local: rm -rf initramfs