• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revision764d46677eca4201be1f5158d60838ffc4ec582f (tree)
Time2022-01-01 02:08:22
AuthorBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Log Message

doc/GNUmakefile: Use GNU make rules to produce the full imdoc list

Change Summary

Incremental Difference

diff -r 9dd4673e32d9 -r 764d46677eca ChangeLog
--- a/ChangeLog Thu Dec 30 19:27:37 2021 -0600
+++ b/ChangeLog Fri Dec 31 11:08:22 2021 -0600
@@ -1,3 +1,10 @@
1+2021-12-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2+
3+ * doc/GNUmakefile: Use GNU make rules to produce the full imdoc
4+ list for man, html, and tex, rather than relying on a shell
5+ wildcard expression, since the order produced by the shell
6+ wildcard expression is indeterminate.
7+
18 2021-12-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
29
310 * www/index.rst: Document that
diff -r 9dd4673e32d9 -r 764d46677eca doc/GNUmakefile
--- a/doc/GNUmakefile Thu Dec 30 19:27:37 2021 -0600
+++ b/doc/GNUmakefile Fri Dec 31 11:08:22 2021 -0600
@@ -1,4 +1,4 @@
1-# Copyright (C) 2003-2013 GraphicsMagick Group
1+# Copyright (C) 2003-2021 GraphicsMagick Group
22 #
33 # This program is covered by multiple licenses, which are described in
44 # Copyright.txt. You should have received a copy of Copyright.txt with this
@@ -8,7 +8,9 @@
88 # Written by Bob Friesenhahn based on previous work by Glenn Randers-Pehrson
99 #
1010
11+# This list also determines the order of the manual page
1112 UTILITIES = \
13+ GraphicsMagick \
1214 animate \
1315 batch \
1416 benchmark \
@@ -22,12 +24,11 @@
2224 mogrify \
2325 montage \
2426 time \
25- version \
26- GraphicsMagick
27+ version
2728
2829 UTILSUBDIR = expanded/$(UTILITY)
2930 UTILBASE = $(UTILITY)
30-UTILSUBWILDCARD = expanded/*
31+UTILSUBWILDCARD = $(addprefix expanded/, $(UTILITIES))
3132 INSTALLWWW = ../www
3233 INSTALLUTILITIES = ../utilities
3334 GMSUBDIR=Gm
@@ -104,22 +105,22 @@
104105 $(INSTALLUTILITIES)/gm.1: gm.1
105106 cp -p $< $@
106107
107-$(GMSUBDIR)/man.imdoc: targets-man
108- @if test ! -d $(GMSUBDIR); then mkdir -p $(GMSUBDIR); fi
108+$(GMSUBDIR):
109+ mkdir -p $(GMSUBDIR)
110+
111+$(GMSUBDIR)/man.imdoc: targets-man $(GMSUBDIR)
109112 -rm -f $@ $@.tmp
110- cat $(UTILSUBWILDCARD)/man.imdoc > $@.tmp && \
113+ cat $(addsuffix /man.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \
111114 mv $@.tmp $@
112115
113-$(GMSUBDIR)/html.imdoc: targets-html
114- @if test ! -d $(GMSUBDIR); then mkdir -p $(GMSUBDIR); fi
116+$(GMSUBDIR)/html.imdoc: targets-html $(GMSUBDIR)
115117 -rm -f $@ $@.tmp
116- cat $(UTILSUBWILDCARD)/html.imdoc > $@.tmp && \
118+ cat $(addsuffix /html.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \
117119 mv $@.tmp $@
118120
119-$(GMSUBDIR)/tex.imdoc: targets-tex
120- @if test ! -d $(GMSUBDIR); then mkdir -p $(GMSUBDIR); fi
121+$(GMSUBDIR)/tex.imdoc: targets-tex $(GMSUBDIR)
121122 -rm -f $@ $@.tmp
122- cat $(UTILSUBWILDCARD)/tex.imdoc > $@.tmp && \
123+ cat $(addsuffix /tex.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \
123124 mv $@.tmp $@
124125
125126 #
Show on old repository browser