maint: use COPYING.LIB version 2.1

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0e468b5..258cebe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
-SUBDIRS = src daemon appliance fish po examples images \
-       capitests regressions
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+       gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -52,13 +52,11 @@ SUBDIRS += cat
 endif
 
 EXTRA_DIST = \
-       config.rpath \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
        guestfish.pod guestfish-actions.pod \
        html/pod.css \
        HACKING TODO \
        libguestfs.pc libguestfs.pc.in \
-       gitlog-to-changelog \
        recipes/LICENSE \
        recipes/README \
        recipes/*.html \
@@ -105,6 +103,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@//' \
@@ -116,6 +115,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@//' \
          < $< | \
@@ -127,6 +127,7 @@ 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 $@
@@ -150,17 +151,19 @@ website: $(HTMLFILES) $(TEXTFILES)
 # 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 -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
-       grep -v '/blib/' | \
-       grep -v '/capitests/' | \
-       grep -v '/examples/' | \
-       sort | \
+       find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
+       grep -v 'perl/blib/' | \
+       grep -v 'capitests/' | \
+       grep -v 'examples/' | \
+       grep -v '/guestfs_protocol.c' | \
+       grep -v '/rc_protocol.c' | \
+       LC_ALL=C sort | \
        sed 's,^\./,,' > po/POTFILES.in
 
 # Pkgconfig.
@@ -170,7 +173,11 @@ pkgconfig_DATA = libguestfs.pc
 
 # 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