From 8c3d84caaceb01116757f2561ec3d4bdee25bca8 Mon Sep 17 00:00:00 2001
From: John Swinbank <swinbank@astron.nl>
Date: Mon, 7 Jun 2021 12:33:55 +0200
Subject: [PATCH] Reorganize makefile snippets
---
changes.make | 4 ----
example/Makefile | 2 +-
make/changes.make | 6 ++++++
vcs-meta.make => make/vcs-meta.make | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
delete mode 100644 changes.make
create mode 100644 make/changes.make
rename vcs-meta.make => make/vcs-meta.make (89%)
diff --git a/changes.make b/changes.make
deleted file mode 100644
index 257d603..0000000
--- a/changes.make
+++ /dev/null
@@ -1,4 +0,0 @@
-.FORCE:
-
-changes.tex: Makefile .FORCE
- astron-texmf/bin/gen_change_record.py > changes.tex
diff --git a/example/Makefile b/example/Makefile
index 680e3d3..d3f80d5 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -8,4 +8,4 @@ $(DOCNAME).pdf: $(DOCNAME).tex meta.tex
xelatex $(DOCNAME)
xelatex $(DOCNAME)
-include ../vcs-meta.make
+include ../make/vcs-meta.make
diff --git a/make/changes.make b/make/changes.make
new file mode 100644
index 0000000..7e9c1ff
--- /dev/null
+++ b/make/changes.make
@@ -0,0 +1,6 @@
+.FORCE:
+
+changes.tex: Makefile .FORCE
+ rm -f $@
+ printf "%s\n" "% GENERATED FILE -- do not edit" >>$@
+ astron-texmf/bin/gen_change_record.py >>$@
diff --git a/vcs-meta.make b/make/vcs-meta.make
similarity index 89%
rename from vcs-meta.make
rename to make/vcs-meta.make
index b47bd96..44a4c5d 100644
--- a/vcs-meta.make
+++ b/make/vcs-meta.make
@@ -7,7 +7,7 @@ GITLASTYEAR := $(shell git log -1 --date=short --pretty=%ad | cut -d- -f1)
meta.tex: Makefile .FORCE
rm -f $@
- printf "%s\n" "% GENERATED FILE -- edit this in the Makefile" >>$@
+ printf "%s\n" "% GENERATED FILE -- do not edit" >>$@
printf "%s\n" "\newcommand{\vcsRevision}{$(GITVERSION)}" >>$@
printf "%s\n" "\newcommand{\vcsDate}{$(GITDATE)}" >>$@
printf "%s\n" "\newcommand{\vcsFirstYear}{$(GITFIRSTYEAR)}" >>$@
--
GitLab