From dd85d4f06d2e539ef083ba686f76d981f1fd295d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Apr 2016 19:09:23 +0100
Subject: [PATCH] docs: Add list of C source files instead of calculating it
 using 'find'.

Add the real list of C source files to the Makefile, instead of trying
to calculate it.  This (will, in the next commit) fix a problem with
the build on Koji where we created a subdirectory (for python3/) but
the find command picked up files from that directory for the
documentation (and then failed).

This fixes commit 04229c68d60ce1437b6c1fbee95f23bc12d5cb55.
---
 Makefile.am         |  11 +-
 docs/C_SOURCE_FILES | 278 ++++++++++++++++++++++++++++++++++++++++++++
 docs/Makefile.am    |   2 +-
 3 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 docs/C_SOURCE_FILES

diff --git a/Makefile.am b/Makefile.am
index 50687f61b..6912b06b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -268,14 +268,16 @@ dist-hook:
 	mv AUTHORS-t AUTHORS
 	cp AUTHORS $(distdir)/AUTHORS
 
-# Update the list of translatable files.  These are separated into:
+# Update lists of files.  These are separated into:
 #
-#  po/POTFILES - files with ordinary extensions, but not OCaml files
+#  docs/C_SOURCE_FILES
+#                 - source files scanned for internal documentation
+#  po/POTFILES    - files with ordinary extensions, but not OCaml files
 #  po/POTFILES-pl - Perl files that don't end in *.pl, which need a
 #                   special xgettext option [not generated here]
 #  po/POTFILES-ml - OCaml files, which need a special tool to translate
 #
-# See po/Makefile.am.
+# For more information about translations, see po/Makefile.am.
 #
 # This has to be in the top-level Makefile.am so that we have access
 # to DIST_SUBDIRS.
@@ -286,6 +288,9 @@ all-local:
 	grep -v -E '/((guestfs|rc)_protocol\.c)$$' | \
 	grep -v -E '^python/utils\.c$$' | \
 	LC_ALL=C sort > po/POTFILES
+	find $(DIST_SUBDIRS) -name '*.c' | \
+	grep -v -E '^(builder/index-parse.c|builder/index-scan.c|examples/|gnulib/|gobject/|perl/|tests/|test-data/)' | \
+	LC_ALL=C sort > docs/C_SOURCE_FILES
 	cd $(srcdir); \
 	find builder customize dib get-kernel mllib resize sparsify sysprep v2v -name '*.ml' | \
 	LC_ALL=C sort > po/POTFILES-ml
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
new file mode 100644
index 000000000..a477744e2
--- /dev/null
+++ b/docs/C_SOURCE_FILES
@@ -0,0 +1,278 @@
+align/scan.c
+builder/index-parser-c.c
+builder/index-struct.c
+builder/index-validate.c
+builder/pxzcat-c.c
+builder/setlocale-c.c
+builder/yajl-c.c
+cat/cat.c
+cat/filesystems.c
+cat/log.c
+cat/ls.c
+cat/visit.c
+customize/crypt-c.c
+customize/perl_edit-c.c
+daemon/9p.c
+daemon/acl.c
+daemon/augeas.c
+daemon/available.c
+daemon/base64.c
+daemon/blkdiscard.c
+daemon/blkid.c
+daemon/blockdev.c
+daemon/btrfs.c
+daemon/cap.c
+daemon/checksum.c
+daemon/cleanups.c
+daemon/cmp.c
+daemon/command.c
+daemon/compress.c
+daemon/copy.c
+daemon/cpio.c
+daemon/cpmv.c
+daemon/dd.c
+daemon/debug-bmap.c
+daemon/debug.c
+daemon/devsparts.c
+daemon/df.c
+daemon/dir.c
+daemon/dmesg.c
+daemon/dropcaches.c
+daemon/du.c
+daemon/echo-daemon.c
+daemon/errnostring-gperf.c
+daemon/errnostring.c
+daemon/ext2.c
+daemon/fallocate.c
+daemon/file.c
+daemon/fill.c
+daemon/find.c
+daemon/findfs.c
+daemon/format.c
+daemon/fs-min-size.c
+daemon/fsck.c
+daemon/fstrim.c
+daemon/glob.c
+daemon/grep.c
+daemon/grub.c
+daemon/guestfs_protocol.c
+daemon/guestfsd.c
+daemon/headtail.c
+daemon/hexdump.c
+daemon/hivex.c
+daemon/hotplug.c
+daemon/htonl.c
+daemon/initrd.c
+daemon/inotify.c
+daemon/internal.c
+daemon/is.c
+daemon/isoinfo.c
+daemon/journal.c
+daemon/labels.c
+daemon/ldm.c
+daemon/link.c
+daemon/ls.c
+daemon/luks.c
+daemon/lvm-filter.c
+daemon/lvm.c
+daemon/md.c
+daemon/mkfs.c
+daemon/mknod.c
+daemon/mktemp.c
+daemon/modprobe.c
+daemon/mount.c
+daemon/mountable.c
+daemon/names.c
+daemon/ntfs.c
+daemon/ntfsclone.c
+daemon/optgroups.c
+daemon/parted.c
+daemon/pingdaemon.c
+daemon/proto.c
+daemon/readdir.c
+daemon/realpath.c
+daemon/rename.c
+daemon/rsync.c
+daemon/scrub.c
+daemon/selinux.c
+daemon/sfdisk.c
+daemon/sh.c
+daemon/sleep.c
+daemon/sleuthkit.c
+daemon/stat.c
+daemon/statvfs.c
+daemon/strings.c
+daemon/stubs.c
+daemon/swap.c
+daemon/sync.c
+daemon/syslinux.c
+daemon/tar.c
+daemon/truncate.c
+daemon/umask.c
+daemon/upload.c
+daemon/utimens.c
+daemon/utsname.c
+daemon/uuids.c
+daemon/wc.c
+daemon/xattr.c
+daemon/xfs.c
+daemon/zero.c
+daemon/zerofree.c
+df/df.c
+df/domains.c
+df/estimate-max-threads.c
+df/main.c
+df/output.c
+df/parallel.c
+diff/diff.c
+edit/edit.c
+erlang/erl-guestfs-proto.c
+erlang/erl-guestfs.c
+fish/alloc.c
+fish/cmds-gperf.c
+fish/cmds.c
+fish/completion.c
+fish/config.c
+fish/copy.c
+fish/destpaths.c
+fish/display.c
+fish/domain.c
+fish/echo.c
+fish/edit.c
+fish/event-names.c
+fish/events.c
+fish/file-edit.c
+fish/fish.c
+fish/glob.c
+fish/help.c
+fish/hexedit.c
+fish/inspect.c
+fish/keys.c
+fish/lcd.c
+fish/man.c
+fish/more.c
+fish/options.c
+fish/prep-boot.c
+fish/prep-disk.c
+fish/prep-fs.c
+fish/prep-lv.c
+fish/prep-part.c
+fish/prep.c
+fish/prepopts.c
+fish/progress.c
+fish/rc.c
+fish/rc_protocol.c
+fish/reopen.c
+fish/setenv.c
+fish/supported.c
+fish/tilde.c
+fish/time.c
+fish/uri.c
+fish/windows.c
+format/format.c
+fuse/guestmount.c
+fuse/guestunmount.c
+fuse/test-fuse.c
+fuse/test-guestmount-fd.c
+fuse/test-guestunmount-fd.c
+inspector/inspector.c
+java/com_redhat_et_libguestfs_GuestFS.c
+lua/lua-guestfs.c
+make-fs/make-fs.c
+mllib/dummy.c
+mllib/fsync-c.c
+mllib/mkdtemp-c.c
+mllib/progress-c.c
+mllib/uri-c.c
+ocaml/guestfs-c-actions.c
+ocaml/guestfs-c-errnos.c
+ocaml/guestfs-c.c
+p2v/about-authors.c
+p2v/about-license.c
+p2v/config.c
+p2v/conversion.c
+p2v/gui.c
+p2v/kernel-cmdline.c
+p2v/kernel.c
+p2v/main.c
+p2v/miniexpect.c
+p2v/ssh.c
+p2v/utils.c
+p2v/whole-file.c
+php/extension/guestfs_php.c
+python/guestfs-py-byhand.c
+python/guestfs-py.c
+rescue/rescue.c
+ruby/ext/guestfs/_guestfs.c
+sparsify/statvfs-c.c
+src/actions-0.c
+src/actions-1.c
+src/actions-2.c
+src/actions-3.c
+src/actions-4.c
+src/actions-5.c
+src/actions-6.c
+src/actions-support.c
+src/actions-variants.c
+src/alloc.c
+src/appliance.c
+src/available.c
+src/bindtests.c
+src/canonical-name.c
+src/cleanup.c
+src/command.c
+src/conn-socket.c
+src/copy-in-out.c
+src/create.c
+src/dbdump.c
+src/drives.c
+src/errnostring-gperf.c
+src/errnostring.c
+src/errors.c
+src/event-string.c
+src/events.c
+src/file.c
+src/filearch.c
+src/fuse.c
+src/guestfs_protocol.c
+src/guid.c
+src/handle.c
+src/info.c
+src/inspect-apps.c
+src/inspect-fs-cd.c
+src/inspect-fs-unix.c
+src/inspect-fs-windows.c
+src/inspect-fs.c
+src/inspect-icon.c
+src/inspect.c
+src/journal.c
+src/launch-direct.c
+src/launch-libvirt.c
+src/launch-uml.c
+src/launch-unix.c
+src/launch.c
+src/libvirt-auth.c
+src/libvirt-domain.c
+src/libvirt-is-version.c
+src/listfs.c
+src/lpj.c
+src/match.c
+src/mountable.c
+src/osinfo.c
+src/private-data.c
+src/proto.c
+src/stringsbuf.c
+src/structs-cleanup.c
+src/structs-compare.c
+src/structs-copy.c
+src/structs-free.c
+src/structs-print.c
+src/test-utils.c
+src/tmpdirs.c
+src/utils.c
+src/whole-file.c
+test-tool/test-tool.c
+v2v/changeuid-c.c
+v2v/domainxml-c.c
+v2v/utils-c.c
+v2v/xml-c.c
diff --git a/docs/Makefile.am b/docs/Makefile.am
index baeb11f29..5ae230966 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -117,7 +117,7 @@ stamp-guestfs-internals.pod: guestfs-internals.pod internal-documentation.pod
 	  $<
 	touch $@
 
-source_files := $(shell cd $(top_srcdir) && find -name '*.c' | $(SED) 's,^\./,,' | grep -Ev '^(\.gnulib/|gobject/|builder/index-scan.c)')
+source_files := $(shell cat $(srcdir)/C_SOURCE_FILES)
 
 internal-documentation.pod: $(source_files:%=$(top_srcdir)/%)
 	rm -f $@ $@-t