X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=86d4e0a5fe19cc96e6a08510ca4b6eea12c4de25;hp=020d889debbc3ea277f05a825d594159049da9c9;hb=a6054bf90f39a84c1a8f8f7d3b9e81e84cb13696;hpb=e28207d5ad7ed96e10467e38788239ef9690285e diff --git a/Makefile.am b/Makefile.am index 020d889..86d4e0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # libguestfs -# Copyright (C) 2009 Red Hat Inc. +# Copyright (C) 2009-2010 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,35 +19,37 @@ include $(top_srcdir)/subdir-rules.mk ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \ - gnulib/tests capitests regressions test-tool +# Basic source for the library. +SUBDIRS = gnulib/lib images generator src examples po -# 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 +if ENABLE_DAEMON +SUBDIRS += daemon endif - -if HAVE_INSPECTOR -SUBDIRS += inspector -endif -if HAVE_TOOLS -SUBDIRS += tools +if ENABLE_APPLIANCE +SUBDIRS += appliance endif -if HAVE_FUSE -SUBDIRS += fuse -endif +# Tests and the test-tool. +SUBDIRS += gnulib/tests capitests regressions test-tool +# Guestfish. +SUBDIRS += fish + +# virt-tools in C. +SUBDIRS += cat df inspector rescue + +# Language bindings. +if HAVE_PERL +SUBDIRS += perl +endif if HAVE_OCAML SUBDIRS += ocaml ocaml/examples endif if HAVE_PYTHON -SUBDIRS += python +SUBDIRS += python python/examples endif if HAVE_RUBY -SUBDIRS += ruby +SUBDIRS += ruby ruby/examples endif if HAVE_JAVA SUBDIRS += java @@ -55,11 +57,29 @@ endif if HAVE_HASKELL SUBDIRS += haskell endif +if HAVE_PHP +SUBDIRS += php +endif + +# Unconditional because nothing is built yet. +SUBDIRS += csharp + +# Perl tools and guestmount. +if HAVE_TOOLS +SUBDIRS += tools +endif + +if HAVE_FUSE +SUBDIRS += fuse +endif + +# po-docs must come after tools, inspector. +SUBDIRS += po-docs EXTRA_DIST = \ $(generator_built) \ html/pod.css \ - HACKING TODO \ + BUGS HACKING RELEASE-NOTES TODO \ libguestfs.pc libguestfs.pc.in \ recipes/LICENSE \ recipes/README \ @@ -69,41 +89,9 @@ EXTRA_DIST = \ html/recipes.css \ make-recipes.sh \ contrib/README \ - bindtests - -# HTML versions of manual pages. - -noinst_DATA = html/guestfs.3.html html/guestfish.1.html - -html/guestfs.3.html: src/guestfs.pod \ - src/guestfs-actions.pod \ - src/guestfs-availability.pod \ - src/guestfs-structs.pod - mkdir -p html - sed \ - -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \ - -e 's/@ACTIONS@//' \ - -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \ - -e 's/@AVAILABILITY@//' \ - -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \ - -e 's/@STRUCTS@//' \ - < $< | \ - pod2html \ - --css 'pod.css' \ - --title "libguestfs API documentation" \ - --htmldir html \ - --outfile $@ - -html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod - mkdir -p html - sed \ - -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \ - < $< | \ - pod2html \ - --css 'pod.css' \ - --title "guestfish, libguestfs filesystem interactive shell" \ - --htmldir html \ - --outfile $@ + bindtests \ + .gitignore \ + m4/.gitignore # Recipes web page. html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh @@ -114,24 +102,29 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar HTMLFILES = \ html/guestfs.3.html \ + html/guestfs-examples.3.html \ + html/guestfs-ocaml.3.html \ + html/guestfs-python.3.html \ + html/guestfs-ruby.3.html \ html/guestfish.1.html \ html/guestmount.1.html \ - html/hivex.3.html \ - html/hivexget.1.html \ - html/hivexml.1.html \ html/virt-cat.1.html \ html/virt-df.1.html \ html/virt-edit.1.html \ + html/virt-filesystems.1.html \ html/virt-inspector.1.html \ html/virt-list-filesystems.1.html \ + html/virt-list-partitions.1.html \ html/virt-ls.1.html \ + html/virt-make-fs.1.html \ html/virt-rescue.1.html \ + html/virt-resize.1.html \ html/virt-tar.1.html \ html/virt-win-reg.1.html \ html/recipes.html \ html/pod.css html/recipes.css -TEXTFILES = README TODO HACKING +TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs @@ -144,26 +137,25 @@ website: $(HTMLFILES) $(TEXTFILES) -e "s/SUBST_DATE/$$date/" \ < index.html.in > index.html -# Generate the ChangeLog automatically from the gitlog. - +# When doing 'make dist' update a few files automatically. dist-hook: $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog + $(top_srcdir)/update-bugs.sh > BUGS-t + mv BUGS-t BUGS + cp BUGS $(distdir)/BUGS + git log --pretty="format:%an" | sort -u | \ + grep -v rjones | \ + grep -v "Richard Jones" \ + > AUTHORS-t + mv AUTHORS-t AUTHORS + cp AUTHORS $(distdir)/AUTHORS # 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-list-filesystems' -o \ - -name 'virt-ls' -o \ - -name 'virt-rescue' -o \ - -name 'virt-tar' -o \ - -name 'virt-win-reg' | \ + -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ grep -v '^perl/blib/' | \ grep -v '^capitests/' | \ grep -v '^daemon/lib/' | \ @@ -174,6 +166,7 @@ all-local: grep -v '/guestfs_protocol.c' | \ grep -v '/rc_protocol.c' | \ grep -v 'appliance/debian/root' | \ + grep -v '^po-docs/' | \ LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in @@ -184,11 +177,55 @@ pkgconfig_DATA = libguestfs.pc # Make clean. -CLEANFILES = $(fs_DATA) \ - emptydisk \ +CLEANFILES = \ pod2htm?.tmp \ - html/*.html \ - guestfs.3 guestfish.1 + html/*.html clean-local: rm -rf initramfs + +# If you don't want to run all of the tests ('make check') then this +# will just run libguestfs-test-tool for a quick check. Note this +# is NOT a substitute for proper testing! + +quickcheck: + test-tool/run-test-tool-locally + +# Mostly static binary distribution. +# +# Some binaries are relinked partially statically. You can make these +# binaries "more static" by making sure that as many foo-static +# packages are installed as possible. +# +# We remove the supermin appliance and adjust some directories to make +# them non-Fedora-specific. + +BINTMPDIR = /tmp/libguestfs-bin +bindist: + rm -rf $(BINTMPDIR) + mkdir $(BINTMPDIR) + $(MAKE) + $(MAKE) DESTDIR=$(BINTMPDIR) install + rm -r $(BINTMPDIR)$(libdir)/guestfs/supermin.d + rm $(BINTMPDIR)$(libdir)/guestfs/kmod.whitelist + mv $(BINTMPDIR)$(prefix)/lib64/* $(BINTMPDIR)$(libdir) + mv $(BINTMPDIR)/usr/lib64/* $(BINTMPDIR)$(libdir) + -find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \; + $(MAKE) -C fish guestfish.static + cp fish/guestfish.static $(BINTMPDIR)$(bindir)/guestfish + $(MAKE) -C fuse guestmount.static + cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount + $(MAKE) -C test-tool libguestfs-test-tool.static + cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool + $(MAKE) -C cat virt-cat.static virt-filesystems.static virt-ls.static + cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat + cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems + cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls + $(MAKE) -C df virt-df.static + cp df/virt-df.static $(BINTMPDIR)$(bindir)/virt-df + $(MAKE) -C inspector virt-inspector.static + cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector + $(MAKE) -C rescue virt-rescue.static + cp rescue/virt-rescue.static $(BINTMPDIR)$(bindir)/virt-rescue + (cd $(BINTMPDIR) && tar cf - .) | \ + gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz