From b8c39cee72606759fdc50e7264db91eeb4888284 Mon Sep 17 00:00:00 2001
From: Silas Vedder <singingfox123@protonmail.com>
Date: Fri, 14 Oct 2022 15:30:59 +0200
Subject: [PATCH] hall build -x

---
 Makefile.am  | 28 +++++++++++++++++++++++-----
 configure.ac |  5 +++--
 guix.scm     |  4 ++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8914b92..4959ed7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
-bin_SCRIPTS = scripts/bible2latex \
-              scripts/count-words
+bin_SCRIPTS = scripts/bible-app \
+              scripts/word-counter \
+              scripts/bible2latex
 
 # Handle substitution of fully-expanded Autoconf variables.
 do_subst = $(SED)					\
@@ -33,7 +34,9 @@ SUFFIXES = .scm .go
 .scm.go:
 	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
 
-SOURCES = bible-tools.scm
+SOURCES = bible-tools/latex-export.scm \
+          bible-tools/count-words.scm \
+          bible-tools/bible-tools.scm
 
 TESTS = 
 
@@ -51,17 +54,32 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
 
 AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
 
-info_TEXINFOS = doc/bible-tools.texi
+info_TEXINFOS = doc/bible-tools.texi \
+                doc/version.texi
 dvi: # Don't build dvi docs
 
-EXTRA_DIST += COPYING \
+EXTRA_DIST += doc/stamp-vti \
+              doc/bible-tools.info \
+              doc/.dirstamp \
+              COPYING \
               HACKING \
               README \
               README.org \
+              NEWS \
+              AUTHORS \
+              ChangeLog \
               hall.scm \
               .gitignore \
               guix.scm \
               build-aux/test-driver.scm \
+              build-aux/texinfo.tex \
+              build-aux/mdate-sh \
+              build-aux/missing \
+              build-aux/install-sh \
+              configure.ac \
+              Makefile.am \
+              pre-inst-env.in \
+              build-aux/test-driver.scm \
               $(TESTS)
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index a262bd4..654aa9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,15 +5,16 @@ AC_SUBST(HVERSION, "\"1.0\"")
 AC_SUBST(AUTHOR, "\"\"")
 AC_SUBST(COPYRIGHT, "'(2022)")
 AC_SUBST(LICENSE, gpl3+)
-AC_CONFIG_SRCDIR(bible-tools.scm)
+AC_CONFIG_SRCDIR(bible-tools)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects  color-tests parallel-tests -Woverride -Wno-portability])
 AM_SILENT_RULES([yes])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
+AC_CONFIG_FILES([scripts/bible-app],[chmod +x scripts/bible-app])
+AC_CONFIG_FILES([scripts/word-counter],[chmod +x scripts/word-counter])
 AC_CONFIG_FILES([scripts/bible2latex],[chmod +x scripts/bible2latex])
-AC_CONFIG_FILES([scripts/count-words],[chmod +x scripts/count-words])
 dnl Search for 'guile' and 'guild'.  This macro defines
 dnl 'GUILE_EFFECTIVE_VERSION'.
 GUILE_PKG([3.0 2.2 2.0])
diff --git a/guix.scm b/guix.scm
index 80a44ae..de141f1 100644
--- a/guix.scm
+++ b/guix.scm
@@ -20,9 +20,9 @@
         (method git-fetch)
         (uri (git-reference
                (url "https://git.silasvedder.xyz/silasfox/bible-tools.git")
-               (commit "5d0dbd6")))
+               (commit "2f62844")))
         (file-name "bible-tools-1.0-checkout")
-        (sha256 (base32 "1x03fzal7vsc7j4bbsphs3v6fsa6m0wkcjzk7a56nn0by3a397dw"))))
+        (sha256 (base32 "1airsisk6cww2vj346d1pwsh0ppwrdhcp1fvcik48kn5nkl4v51n"))))
     (build-system gnu-build-system)
     (arguments
       `(#:modules