List for cgit developers and users
 help / color / mirror / Atom feed
From: tmz at pobox.com (Todd Zullinger)
Subject: [RFC PATCH] Makefile: work around parallel make issues in docs
Date: Sat, 16 Jun 2018 12:32:06 -0400	[thread overview]
Message-ID: <20180616163205.GE11827@zaya.teonanacatl.net> (raw)
In-Reply-To: <20180616122010.GN1922@john.keeping.me.uk>

Hi John,

John Keeping wrote:
> How about the patch below instead?  It's a bigger change to the output
> format for HTML, but as a side effect it fixes the parallel build.

It does, but only if the targets are 'doc-man doc-html'.
For the default 'doc' target which includes 'doc-pdf', the
issue is still present.

As a bonus, the output is much nicer, I think.

We could perhaps work around the 'doc-pdf' failure by adding a
dep on '($DOC_MAN5)':

-- >8 --
diff --git i/Makefile w/Makefile
index 70f32a4..4879a5a 100644
--- i/Makefile
+++ w/Makefile
@@ -143,7 +143,7 @@ $(DOC_HTML): %.html : %.txt
        $(TXT_TO_HTML) -o $@+ $< && \
        mv $@+ $@
 
-$(DOC_PDF): %.pdf : %.txt
+$(DOC_PDF): %.pdf : $(DOC_MAN5) %.txt
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc
-- >8 --

That's hackish, no doubt.

We might also want to drop 'doc-pdf' from the default 'doc'
target.  The alternative is driving the asciidoc pipeline
for the pdf generation too.  That looks a little more
involved than doing it for html, but perhaps it's not as bad
as I think.

At first I was concerned that this loses the xsltproc option
to generate consistent id's in the html, but the html
generated by asciidoc this way doesn't appear to suffer from
the problem solved by that xsltproc option. :)

Thanks,

-- 
Todd
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Common sense is the collection of prejudices acquired by age eighteen.
    -- Albert Einstein



  parent reply	other threads:[~2018-06-16 16:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-16  5:38 tmz
2018-06-16  6:55 ` thomas.moschny
2018-06-16 16:40   ` tmz
2018-06-16 12:20 ` john
2018-06-16 12:50   ` Jason
2018-06-16 16:32   ` tmz [this message]
2018-06-16 17:18     ` john
2018-06-16 17:52       ` tmz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180616163205.GE11827@zaya.teonanacatl.net \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).