build-aux/m4/calcdsl.m4: Do not generate suppliers.mk

This will be generated automatically by the Makefile.  It's not appropriate
to generate in the configure script, and I do not recall why I did
so---possibly to work around the issue of delayed tab completion when it
needs regeneration?

This removes suppmk-gen in favor of more generic Makefile targets---in this
case, having `%.tdat` depend upon `rater/core/tdat.xml`, even though that's
not quite true (the %.xml file generated from it needs it).  But these files
are going away soon; a pending TAME optimization branch removes support for
the underlying pattern primitive entirely; CSVMs should be used instead.

RELEASES.md

@@ -23,6 +23,9 @@ Build System
 ------------
 - Only modify `.version.xml` timestamp when hash changes.  This allows
   its use as a dependency without forcefully rebuilding each and every time.
+- `configure` will no longer immediately generate `suppliers.mk`.
+  - Additionally, `build-aux/suppmk-gen`, which `configure` directly invoked
+    until now, was removed in favor of generic rules in `Makefile.am`.
 
 
 v17.7.0 (2020-12-09)

build-aux/Makefile.am

@@ -170,7 +170,9 @@ c1map: $(dest_c1map)
 %.svg: %.dot
 	dot -Tsvg "$<" > "$@"
 
-%.xml: %.dat
+# These are deprecated and will be removed in a future version of TAME (in
+# favor of CSVM tables).
+%.xml: %.dat rater/core/tdat.xmlo
 	rater/tools/tdat2xml $< > $@
 
 %.xml: %.typelist

build-aux/m4/calcdsl.m4

@@ -88,11 +88,3 @@ AC_CONFIG_FILES(Makefile:m4_defn(`calc_root')/build-aux/Makefile.in)
 
 # Generate configure script
 AC_OUTPUT
-
-# we want this to run as part of the configure script, not during M4
-# expansion
-"$CALCROOT/build-aux/suppmk-gen" $SRCPATHS || exit
-
-AC_MSG_NOTICE([complete
-
-You may now run `make` to build.])

build-aux/suppmk-gen

@@ -1,42 +0,0 @@
-#!/bin/bash
-# Configuration script to be run before `make'
-#
-#   Copyright (C) 2014-2020 Ryan Specialty Group, LLC.
-#
-#   This program 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.
-#
-#   This program 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
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-set -euo pipefail
-
-echo "Generating suppliers.mk..."
-# TODO: kluge; do properly.
-rm -f suppliers.mk
-make suppliers.mk
-
-# XXX: paths are hard-coded here!
-while read csv; do
-  csvbase="${csv%%.*}"
-  echo "$csvbase.xmlo: $csvbase.xml"
-  echo "$csvbase.xml: $csvbase.csvo"
-done < <( find "$@" -regex '^.+\.csv.?$' ) \
-  >> suppliers.mk
-
-while read tdat; do
-  tbase="${tdat%%.*}"
-  echo "$tbase.xmlo: $tbase.xml rater/core/tdat.xmlo"
-  echo "$tbase.xml: $tdat"
-  echo -e "\trater/tools/tdat2xml \$< > \$@"
-done < <( find "$@" -regex '^.+territories/.+\.dat$' ) \
-  >> suppliers.mk
-