| Révision | 764d46677eca4201be1f5158d60838ffc4ec582f (tree) |
|---|---|
| l'heure | 2022-01-01 02:08:22 |
| Auteur | Bob Friesenhahn <bfriesen@Grap...> |
| Commiter | Bob Friesenhahn |
doc/GNUmakefile: Use GNU make rules to produce the full imdoc list
ChangeLog (diff) doc/GNUmakefile (diff)| @@ -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 | + | |
| 1 | 8 | 2021-12-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> |
| 2 | 9 | |
| 3 | 10 | * www/index.rst: Document that |
| @@ -1,4 +1,4 @@ | ||
| 1 | -# Copyright (C) 2003-2013 GraphicsMagick Group | |
| 1 | +# Copyright (C) 2003-2021 GraphicsMagick Group | |
| 2 | 2 | # |
| 3 | 3 | # This program is covered by multiple licenses, which are described in |
| 4 | 4 | # Copyright.txt. You should have received a copy of Copyright.txt with this |
| @@ -8,7 +8,9 @@ | ||
| 8 | 8 | # Written by Bob Friesenhahn based on previous work by Glenn Randers-Pehrson |
| 9 | 9 | # |
| 10 | 10 | |
| 11 | +# This list also determines the order of the manual page | |
| 11 | 12 | UTILITIES = \ |
| 13 | + GraphicsMagick \ | |
| 12 | 14 | animate \ |
| 13 | 15 | batch \ |
| 14 | 16 | benchmark \ |
| @@ -22,12 +24,11 @@ | ||
| 22 | 24 | mogrify \ |
| 23 | 25 | montage \ |
| 24 | 26 | time \ |
| 25 | - version \ | |
| 26 | - GraphicsMagick | |
| 27 | + version | |
| 27 | 28 | |
| 28 | 29 | UTILSUBDIR = expanded/$(UTILITY) |
| 29 | 30 | UTILBASE = $(UTILITY) |
| 30 | -UTILSUBWILDCARD = expanded/* | |
| 31 | +UTILSUBWILDCARD = $(addprefix expanded/, $(UTILITIES)) | |
| 31 | 32 | INSTALLWWW = ../www |
| 32 | 33 | INSTALLUTILITIES = ../utilities |
| 33 | 34 | GMSUBDIR=Gm |
| @@ -104,22 +105,22 @@ | ||
| 104 | 105 | $(INSTALLUTILITIES)/gm.1: gm.1 |
| 105 | 106 | cp -p $< $@ |
| 106 | 107 | |
| 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) | |
| 109 | 112 | -rm -f $@ $@.tmp |
| 110 | - cat $(UTILSUBWILDCARD)/man.imdoc > $@.tmp && \ | |
| 113 | + cat $(addsuffix /man.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \ | |
| 111 | 114 | mv $@.tmp $@ |
| 112 | 115 | |
| 113 | -$(GMSUBDIR)/html.imdoc: targets-html | |
| 114 | - @if test ! -d $(GMSUBDIR); then mkdir -p $(GMSUBDIR); fi | |
| 116 | +$(GMSUBDIR)/html.imdoc: targets-html $(GMSUBDIR) | |
| 115 | 117 | -rm -f $@ $@.tmp |
| 116 | - cat $(UTILSUBWILDCARD)/html.imdoc > $@.tmp && \ | |
| 118 | + cat $(addsuffix /html.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \ | |
| 117 | 119 | mv $@.tmp $@ |
| 118 | 120 | |
| 119 | -$(GMSUBDIR)/tex.imdoc: targets-tex | |
| 120 | - @if test ! -d $(GMSUBDIR); then mkdir -p $(GMSUBDIR); fi | |
| 121 | +$(GMSUBDIR)/tex.imdoc: targets-tex $(GMSUBDIR) | |
| 121 | 122 | -rm -f $@ $@.tmp |
| 122 | - cat $(UTILSUBWILDCARD)/tex.imdoc > $@.tmp && \ | |
| 123 | + cat $(addsuffix /tex.imdoc, $(UTILSUBWILDCARD)) > $@.tmp && \ | |
| 123 | 124 | mv $@.tmp $@ |
| 124 | 125 | |
| 125 | 126 | # |
Fork