X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=86d4e0a5fe19cc96e6a08510ca4b6eea12c4de25;hp=2fde7ffe4283d2f4c11ea7b8820b235bbd3533d7;hb=a6054bf90f39a84c1a8f8f7d3b9e81e84cb13696;hpb=09a0427448b1f4328b9246d4d8a26610bb5228c8 diff --git a/Makefile.am b/Makefile.am index 2fde7ff..86d4e0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk ACLOCAL_AMFLAGS = -I m4 # Basic source for the library. -SUBDIRS = gnulib/lib images src examples po +SUBDIRS = gnulib/lib images generator src examples po if ENABLE_DAEMON SUBDIRS += daemon @@ -33,7 +33,10 @@ endif SUBDIRS += gnulib/tests capitests regressions test-tool # Guestfish. -SUBDIRS += fish +SUBDIRS += fish + +# virt-tools in C. +SUBDIRS += cat df inspector rescue # Language bindings. if HAVE_PERL @@ -43,10 +46,10 @@ 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 @@ -54,12 +57,14 @@ endif if HAVE_HASKELL SUBDIRS += haskell endif - -# Virt-inspector, tools and guestmount. -if HAVE_INSPECTOR -SUBDIRS += inspector +if HAVE_PHP +SUBDIRS += php endif +# Unconditional because nothing is built yet. +SUBDIRS += csharp + +# Perl tools and guestmount. if HAVE_TOOLS SUBDIRS += tools endif @@ -68,10 +73,13 @@ 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 \ @@ -85,40 +93,6 @@ EXTRA_DIST = \ .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 $@ - # Recipes web page. html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh mkdir -p html @@ -128,11 +102,16 @@ 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/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 \ @@ -145,7 +124,7 @@ HTMLFILES = \ 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 @@ -158,29 +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-list-partitions' -o \ - -name 'virt-ls' -o \ - -name 'virt-make-fs' -o \ - -name 'virt-rescue' -o \ - -name 'virt-resize' -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/' | \ @@ -191,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 @@ -201,11 +177,9 @@ 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 @@ -215,6 +189,43 @@ clean-local: # is NOT a substitute for proper testing! quickcheck: - LIBGUESTFS_PATH=appliance \ - test-tool/libguestfs-test-tool \ - --helper test-tool/libguestfs-test-tool-helper + 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