From ac110377b3a6ce93a1efebeaaa8e2e9755ecdd6d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 2 Aug 2021 16:26:34 +0200
Subject: -fix rules for 'make dist'

---
 Makefile.am                    |  8 +++-----
 README                         |  6 ++++++
 contrib/Makefile.am            |  1 -
 doc/doxygen/Makefile.am        |  5 ++++-
 doc/doxygen/taler-exchange.tag |  0
 doc/doxygen/taler-merchant.tag |  0
 src/cli/Makefile.am            |  2 ++
 src/include/Makefile.am        | 13 +++++++------
 src/stasis/Makefile.am         |  1 +
 9 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 doc/doxygen/taler-exchange.tag
 create mode 100644 doc/doxygen/taler-merchant.tag

diff --git a/Makefile.am b/Makefile.am
index 9d2a8f8..8a6319e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,7 @@ endif
 @DX_RULES@
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = config.rpath  \
+EXTRA_DIST = \
+ config.rpath  \
  AUTHORS \
- COPYING.AGPL \
- contrib/gnunet.tag \
- contrib/uncrustify.cfg \
- contrib/uncrustify_precommit
+ COPYING.AGPL
diff --git a/README b/README
index 7a09d7b..29b1a04 100644
--- a/README
+++ b/README
@@ -13,6 +13,12 @@ GNU Anastasis is a key backup and recovery tool from the GNU project.
 This package includes the backend run by the Anastasis providers as
 well as libraries for clients and a command-line interface.
 
+Installation instructions can be found in INSTALL and
+also in the handbook. Please note that you must run
+'make install' before you can run the testsuite using
+'make check'.
+
+
 Dependencies
 ============
 
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 4304bcf..33ec99e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -10,7 +10,6 @@ EXTRA_DIST = \
   pogen.sh \
   gana.sh \
   gana-update.sh \
-  gnunet.tag \
   microhttpd.tag
 
 pkgdata_DATA = \
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 344d45c..3f2a7c1 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -15,4 +15,7 @@ clean:
 	rm -rf html
 
 EXTRA_DIST = \
-   anastasis.doxy
+   anastasis.doxy \
+   gnunet.tag \
+   taler-exchange.tag \
+   taler-merchant.tag
diff --git a/doc/doxygen/taler-exchange.tag b/doc/doxygen/taler-exchange.tag
new file mode 100644
index 0000000..e69de29
diff --git a/doc/doxygen/taler-merchant.tag b/doc/doxygen/taler-merchant.tag
new file mode 100644
index 0000000..e69de29
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 6b8bf23..1dbe5d8 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -38,6 +38,8 @@ EXTRA_DIST = \
   resources/02-backup.json \
   resources/03-backup.json \
   resources/04-backup.json \
+  resources/05-backup.json \
+  resources/06-backup.json \
   resources/00-recovery.json \
   resources/01-recovery.json \
   resources/02-recovery.json
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index f9f6548..bd4d4e2 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -3,13 +3,14 @@ anastasisincludedir = $(includedir)/anastasis
 
 anastasisinclude_HEADERS = \
   platform.h gettext.h \
+  anastasis_authorization_lib.h \
+  anastasis_authorization_plugin.h \
+  anastasis_crypto_lib.h \
+  anastasis_database_lib.h \
   anastasis_database_plugin.h \
-  anastasis_service.h \
   anastasis_error_codes.h \
-  anastasis_database_lib.h \
-  anastasis_util_lib.h \
-  anastasis_crypto_lib.h \
   anastasis_redux.h \
-  anastasis_authorization_plugin.h \
-  anastasis_authorization_lib.h \
+  anastasis_service.h \
+  anastasis_testing_lib.h \
+  anastasis_util_lib.h \
   anastasis.h
diff --git a/src/stasis/Makefile.am b/src/stasis/Makefile.am
index a1d6584..140f65e 100644
--- a/src/stasis/Makefile.am
+++ b/src/stasis/Makefile.am
@@ -92,4 +92,5 @@ TESTS = \
 
 EXTRA_DIST = \
   test_anastasis_db_postgres.conf \
+  $(pkgcfg_DATA) \
   $(sql_DATA)
-- 
cgit v1.2.3