From 3c4ec8e66c5b42e06995adea9392e62b0567db8a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Dec 2019 13:57:49 +0000
Subject: [PATCH] Catacomb: Make arrangements for running convert in `cat'
 subdir

This arranges that each file from catacomb-import-update --convert is
a possible target in cat/, and can be relied on in this and other
makefiles.

None of them are used yet, although we do wire the building into
`all'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 cat/.gitignore |  4 ++++
 cat/Dir.sd.mk  | 32 ++++++++++++++++++++++++++++++++
 configure      |  5 +++++
 configure.ac   |  2 +-
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 cat/.gitignore
 create mode 100644 cat/Dir.sd.mk

diff --git a/cat/.gitignore b/cat/.gitignore
new file mode 100644
index 0000000..cf29261
--- /dev/null
+++ b/cat/.gitignore
@@ -0,0 +1,4 @@
+*.[ch]
+*.in
+*.new
+secnet-import.auto.mk.compare
diff --git a/cat/Dir.sd.mk b/cat/Dir.sd.mk
new file mode 100644
index 0000000..5d7c66f
--- /dev/null
+++ b/cat/Dir.sd.mk
@@ -0,0 +1,32 @@
+# This file is part of secnet.
+# See README for full list of copyright holders.
+#
+# secnet is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# secnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# version 3 along with secnet; if not, see
+# https://www.gnu.org/licenses/gpl.html.
+
+include &~catacomb-import/secnet-import.auto.mk
+
+&CATS = $(addprefix &/, $(CATACOMB_IMPORT_RECIPS))
+
+&TARGETS += &$CATS
+
+.SECONDARY: &cat-converted
+
+&$CATS:	&cat-converted
+	@:
+
+&cat-converted: &~catacomb-import-update
+	&~./catacomb-import-update --convert
+
+&cat-converted: $(addprefix &~catacomb-import/, $(CATACOMB_IMPORT_DONORS))
diff --git a/configure b/configure
index 43de16e..012b387 100755
--- a/configure
+++ b/configure
@@ -2153,6 +2153,10 @@ ac_config_headers="$ac_config_headers config.h"
   ac_config_files="$ac_config_files base91s/Dir.mk:base91s/Dir.mk.tmp"
 
 
+  subdirmk_subdirs="$subdirmk_subdirs 'cat/'"
+  ac_config_files="$ac_config_files cat/Dir.mk:cat/Dir.mk.tmp"
+
+
 
 
 
@@ -4892,6 +4896,7 @@ do
     "mtest/Dir.mk") CONFIG_FILES="$CONFIG_FILES mtest/Dir.mk:mtest/Dir.mk.tmp" ;;
     "stest/Dir.mk") CONFIG_FILES="$CONFIG_FILES stest/Dir.mk:stest/Dir.mk.tmp" ;;
     "base91s/Dir.mk") CONFIG_FILES="$CONFIG_FILES base91s/Dir.mk:base91s/Dir.mk.tmp" ;;
+    "cat/Dir.mk") CONFIG_FILES="$CONFIG_FILES cat/Dir.mk:cat/Dir.mk.tmp" ;;
     "common.make") CONFIG_FILES="$CONFIG_FILES common.make:common.make.in" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
diff --git a/configure.ac b/configure.ac
index 674ed36..2c38f27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_INIT(secnet,0.1.18+,secnet@chiark.greenend.org.uk)
 AC_CONFIG_SRCDIR(secnet.c)
 AC_CONFIG_HEADER(config.h)
 
-SUBDIRMK_SUBDIRS([test-example mtest stest base91s])
+SUBDIRMK_SUBDIRS([test-example mtest stest base91s cat])
 
 AC_PREREQ(2.50)
 AC_REVISION($Id: configure.in,v 1.4 2002/09/09 22:05:02 steve Exp $)
-- 
2.30.2