[taler-merchant] branch master updated: automatically re-generate Makefile.am to match SPA

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 9cbc189f automatically re-generate Makefile.am to match SPA
9cbc189f is described below

commit 9cbc189fa1c3416e541b0c3e1637908639aca8ae
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Apr 24 20:17:29 2023 +0200

    automatically re-generate Makefile.am to match SPA
---
 bootstrap              | 11 +++++++++++
 contrib/.gitignore     |  2 ++
 contrib/Makefile.am    | 40 ----------------------------------------
 contrib/Makefile.am.in | 30 ++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/bootstrap b/bootstrap
index 69e6ad62..bf84c063 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,5 +29,16 @@ else
     echo "Uncrustify not detected, hook not installed. Please install 
uncrustify if you plan on doing development"
 fi
 
+# Generate Makefile.am in contrib/
+cd contrib
+rm -f Makefile.am
+find wallet-core/backoffice/ -type f -printf '  %p \\\n' | sort > 
Makefile.am.ext
+# Remove extra '\' at the end of the file
+truncate -s -2 Makefile.am.ext
+cat Makefile.am.in Makefile.am.ext >> Makefile.am
+# Prevent accidental editing of the generated Makefile.am
+chmod -w Makefile.am
+cd ..
+
 echo "$0: Running autoreconf"
 autoreconf -if
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 94308bdc..ad4d5ab1 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,2 +1,4 @@
 spa.html
 *.must
+Makefile.am
+Makefile.am.ext
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index b222aa68..00000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-tmplpkgdatadir = $(prefix)/share/taler/merchant/templates/
-staticpkgdatadir = $(prefix)/share/taler/merchant/static/
-spapkgdatadir = $(prefix)/share/taler/merchant/spa/
-
-dist_tmplpkgdata_DATA = \
-  depleted_tip.en.must \
-  offer_refund.en.must \
-  offer_tip.en.must \
-  request_payment.en.must \
-  show_order_details.en.must
-
-%.must: wallet-core/backend/%.html 
-       cp $< $@
-
-# Note: only works when building from Git, if you
-# run maintainer clean against the TGZ, you will
-# not be able to recover...
-MAINTAINERCLEANFILES = \
-    $(dist_tmplpkgdata_DATA)
-
-# Note: historic mechanism for static resource files, currently not used.
-#dist_staticpkgdata_DATA = \
-# foo.css
-
-
-# spa.html is the single-page-app imported from the wallet-core.git
-# prebuilt branch.
-dist_spapkgdata_DATA = \
-  wallet-core/backoffice/index.css \
-  wallet-core/backoffice/index.css.map \
-  wallet-core/backoffice/index.html \
-  wallet-core/backoffice/index.js \
-  wallet-core/backoffice/index.js.map \
-  wallet-core/backoffice/languageicon-LWKRUH5D.svg \
-  wallet-core/backoffice/logo-2021-VSZSJ4QZ.svg \
-  wallet-core/backoffice/materialdesignicons-webfont-4.9.95-7W2GKO6O.woff2 \
-  wallet-core/backoffice/materialdesignicons-webfont-4.9.95-GELXKCZG.ttf \
-  wallet-core/backoffice/materialdesignicons-webfont-4.9.95-HENMUVWG.eot \
-  wallet-core/backoffice/materialdesignicons-webfont-4.9.95-WP2MXZKI.woff \
-  wallet-core/backoffice/XRXV3I6Li01BKofINeaE-34D53UZZ.ttf
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
new file mode 100644
index 00000000..b2921bd4
--- /dev/null
+++ b/contrib/Makefile.am.in
@@ -0,0 +1,30 @@
+tmplpkgdatadir = $(prefix)/share/taler/merchant/templates/
+staticpkgdatadir = $(prefix)/share/taler/merchant/static/
+spapkgdatadir = $(prefix)/share/taler/merchant/spa/
+
+dist_tmplpkgdata_DATA = \
+  depleted_tip.en.must \
+  offer_refund.en.must \
+  offer_tip.en.must \
+  request_payment.en.must \
+  show_order_details.en.must
+
+%.must: wallet-core/backend/%.html
+       cp $< $@
+
+# Note: only works when building from Git, if you
+# run maintainer clean against the TGZ, you will
+# not be able to recover...
+MAINTAINERCLEANFILES = \
+    $(dist_tmplpkgdata_DATA)
+
+# Note: historic mechanism for static resource files, currently not used.
+#dist_staticpkgdata_DATA = \
+# foo.css
+
+
+# This is for the single-page-app imported from the wallet-core.git
+# prebuilt branch. This MUST be the last line in the
+# Makefile.am.in, as it will be combined with the
+# actual SPA data by 'bootstrap'!
+dist_spapkgdata_DATA = \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.