From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6BB6A1F4AC for ; Thu, 9 May 2019 07:51:05 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 8/9] doc/include.mk: remove git use and redundant declarations Date: Thu, 9 May 2019 07:51:02 +0000 Message-Id: <20190509075103.27132-9-e@80x24.org> In-Reply-To: <20190509075103.27132-1-e@80x24.org> References: <20190509075103.27132-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: And document that we still have GNU-isms in that include.mk Makefile (and may continue to do so). Finally, take advantage of GNU-isms to warn users to run "gmake" to build all manpages. --- Documentation/include.mk | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/Documentation/include.mk b/Documentation/include.mk index 9089e06..2a02611 100644 --- a/Documentation/include.mk +++ b/Documentation/include.mk @@ -2,10 +2,18 @@ # License: AGPL-3.0+ all:: +# Note: some GNU-isms present and required to build docs +# (including manpages), but at least this should not trigger +# warnings with BSD make(1) when running "make check" +# Maybe it's not worth it to support non-GNU make, though... RSYNC = rsync RSYNC_DEST = public-inbox.org:/srv/public-inbox/ -docs := README COPYING INSTALL TODO HACKING -docs += $(shell git ls-files 'Documentation/*.txt') +txt := INSTALL README COPYING TODO HACKING +dtxt := design_notes.txt design_www.txt dc-dlvr-spam-flow.txt hosted.txt +dtxt += standards.txt +dtxt := $(addprefix Documentation/, $(dtxt)) +docs := $(txt) $(dtxt) + INSTALL = install PODMAN = pod2man PODMAN_OPTS = -v --stderr -d 1993-10-02 -c 'public-inbox user manual' @@ -71,6 +79,7 @@ manuals += $(m8) mantxt = $(addprefix Documentation/, $(addsuffix .txt, $(manuals))) docs += $(mantxt) +dtxt += $(mantxt) all :: $(mantxt) @@ -79,10 +88,6 @@ Documentation/%.txt : Documentation/%.pod txt2pre = $(PERL) -I lib ./Documentation/txt2pre <$< >$@+ && \ touch -r $< $@+ && mv $@+ $@ -txt := INSTALL README COPYING TODO -dtxt := design_notes.txt design_www.txt dc-dlvr-spam-flow.txt hosted.txt -dtxt += standards.txt -dtxt := $(addprefix Documentation/, $(dtxt)) $(mantxt) Documentation/standards.txt : Documentation/standards.perl $(PERL) $< >$@+ && mv $@+ $@ @@ -96,7 +101,10 @@ Documentation/%.html: Documentation/%.txt docs_html := $(addsuffix .html, $(subst .txt,,$(dtxt)) $(txt)) html: $(docs_html) gz_docs := $(addsuffix .gz, $(docs) $(docs_html)) -rsync_docs := $(gz_docs) $(docs) $(txt) $(docs_html) $(dtxt) +rsync_docs := $(gz_docs) $(docs) $(docs_html) + +doc: $(docs) + %.gz: % gzip -9 --rsyncable <$< >$@+ touch -r $< $@+ @@ -111,3 +119,7 @@ clean-doc: $(RM) $(man1) $(man5) $(man7) $(gz_docs) $(docs_html) $(mantxt) clean :: clean-doc + +pure_all :: + @if test x"$(addprefix g, make)" != xgmake; then \ + echo W: gmake is currently required to build manpages; fi -- EW