X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=fcd190a1aedc04c26c5ee9133df0d83e365ca662;hp=6c68dc1d1bd78879410d0b88f47d89345a6e69b0;hb=f24494195ab8541fda7236afb37a4f897c9bcee5;hpb=04d8209077d2227eb1d42695ba71147f78987050 diff --git a/Makefile.am b/Makefile.am index 6c68dc1..fcd190a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # libguestfs -# Copyright (C) 2009-2010 Red Hat Inc. +# Copyright (C) 2009-2011 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 @@ -35,18 +35,21 @@ 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 +SUBDIRS += perl perl/examples 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 @@ -58,11 +61,17 @@ if HAVE_PHP SUBDIRS += php endif -# Virt-inspector, tools and guestmount. -if HAVE_INSPECTOR -SUBDIRS += inspector +# Unconditional because nothing is built yet. +SUBDIRS += csharp + +# virt-resize 2.0 is written in OCaml. +if HAVE_OCAML +if HAVE_OCAML_PCRE +SUBDIRS += resize +endif endif +# Perl tools and guestmount. if HAVE_TOOLS SUBDIRS += tools endif @@ -72,12 +81,14 @@ SUBDIRS += fuse endif # po-docs must come after tools, inspector. +if HAVE_PO4A SUBDIRS += po-docs +endif EXTRA_DIST = \ $(generator_built) \ html/pod.css \ - BUGS HACKING RELEASE-NOTES TODO \ + BUGS HACKING RELEASE-NOTES ROADMAP TODO \ libguestfs.pc libguestfs.pc.in \ recipes/LICENSE \ recipes/README \ @@ -89,41 +100,13 @@ EXTRA_DIST = \ contrib/README \ bindtests \ .gitignore \ - m4/.gitignore - -# 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 $@ + m4/.gitignore \ + libtool-kill-dependency_libs.sh \ + autogen.sh \ + bugs-in-changelog.sh \ + update-bugs.sh \ + logo/fish.svg logo/fish.png \ + run # Recipes web page. html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh @@ -134,11 +117,19 @@ 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-perl.3.html \ + html/guestfs-python.3.html \ + html/guestfs-ruby.3.html \ html/guestfish.1.html \ html/guestmount.1.html \ html/virt-cat.1.html \ + html/virt-copy-in.1.html \ + html/virt-copy-out.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 \ @@ -147,11 +138,13 @@ HTMLFILES = \ html/virt-rescue.1.html \ html/virt-resize.1.html \ html/virt-tar.1.html \ + html/virt-tar-in.1.html \ + html/virt-tar-out.1.html \ html/virt-win-reg.1.html \ html/recipes.html \ html/pod.css html/recipes.css -TEXTFILES = README TODO HACKING +TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs @@ -168,9 +161,15 @@ website: $(HTMLFILES) $(TEXTFILES) dist-hook: $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog - $(top_srcdir)/update-bugs > BUGS-t + $(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: @@ -198,32 +197,18 @@ pkgconfig_DATA = libguestfs.pc # Make clean. -CLEANFILES = $(fs_DATA) \ - emptydisk \ +CLEANFILES = \ pod2htm?.tmp \ - html/*.html \ - guestfs.3 guestfish.1 - -clean-local: - rm -rf initramfs + html/*.html # 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: - LIBGUESTFS_PATH=appliance \ - test-tool/libguestfs-test-tool \ - --helper test-tool/libguestfs-test-tool-helper + ./run test-tool/libguestfs-test-tool -# 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. +# Make binary distribution. BINTMPDIR = /tmp/libguestfs-bin bindist: @@ -231,16 +216,6 @@ bindist: 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 (cd $(BINTMPDIR) && tar cf - .) | \ - gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz + gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz