| Message ID | 20210512222803.508446-8-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | doc: asciidoc cleanups | expand |
On Thu, 13 May 2021 at 00:28, Felipe Contreras <felipe.contreras@gmail.com> wrote: > > asciidoc needs asciidoc.conf, asciidoctor asciidoctor-extensions.rb. > > Neither needs the other. > -ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS > +ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS > +ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS Thanks. I was a bit lazy in a15ef383e7 ("Documentation/Makefile: add missing dependency on asciidoctor-extensions", 2019-02-27). We end up with some duplication. We could pull GIT-ASCIIDOCFLAGS into some ASCIIDOC_DEPS_COMMON. But with just one such common dependency, it seems unnecessary and overly complicated. We can pull out the common dependencies when we actually gain something from it. Martin
diff --git a/Documentation/Makefile b/Documentation/Makefile index f846bb91ee..ba0c947d0d 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -140,7 +140,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' ASCIIDOC_BASE = '$(SHELL_PATH_SQ)' ./asciidoc-helper.sh $(ASCIIDOC_COMMON) -ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -196,6 +196,7 @@ ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_BASE = $(ASCIIDOC_COMMON) +ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl
asciidoc needs asciidoc.conf, asciidoctor asciidoctor-extensions.rb. Neither needs the other. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- Documentation/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)