doc: simplify Makefile using .DELETE_ON_ERROR
Currently GNU make already removes files when catching an interruption signal, however, in order to deal with other kinds of errors a workaround is in place to store target output to a temporary file, and only move it to its right place on success. By enabling the built-in .DELETE_ON_ERROR we let make do this task, so we don't have to. This way the rules can be simplified a lot. Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 21, 2021 at 17:29 UTC
db10fc6c09f1f74c4d0a9294ecbb68d390f54f15
1 file changed
+19
-28
Documentation/Makefile
+19
-28
@@ -296,8 +296,7 @@ docdep_prereqs = \
296
cmd-list.made $(cmds_txt)
297
298
doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl
299
- $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
300
- mv $@+ $@
299
+ $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR)
300
301
ifneq ($(MAKECMDGOALS),clean)
302
-include doc.dep
@@ -355,12 +354,10 @@ clean:
354
$(RM) GIT-ASCIIDOCFLAGS
355
356
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
358
- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@+ $< && \
359
- mv $@+ $@
357
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
358
359
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
362
- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \
363
- mv $@+ $@
360
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
361
362
manpage-base-url.xsl: manpage-base-url.xsl.in
363
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
@@ -369,12 +366,10 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
366
$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
367
368
%.xml : %.txt $(ASCIIDOC_DEPS)
372
- $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \
373
- mv $@+ $@
369
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
370
371
user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
376
- $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@+ $< && \
377
- mv $@+ $@
372
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
373
374
technical/api-index.txt: technical/api-index-skel.txt \
375
technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -395,41 +390,35 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
390
XSLTOPTS += --param generate.consistent.ids 1
391
392
user-manual.html: user-manual.xml $(XSLT)
398
- $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
399
- mv $@+ $@
393
+ $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
394
395
git.info: user-manual.texi
396
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
397
398
user-manual.texi: user-manual.xml
405
- $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
406
- $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
407
- rm $@++ && \
408
- mv $@+ $@
399
+ $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \
400
+ $(PERL_PATH) fix-texi.perl <$@+ >$@ && \
401
+ rm $@+
402
403
user-manual.pdf: user-manual.xml
411
- $(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
412
- mv $@+ $@
404
+ $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $<
405
406
gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
407
$(QUIET_DB2TEXI) \
408
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
409
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
418
- rm $(xml)+ &&) true) > $@++ && \
419
- $(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
420
- rm $@++ && \
421
- mv $@+ $@
410
+ rm $(xml)+ &&) true) > $@+ && \
411
+ $(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \
412
+ rm $@+
413
414
gitman.info: gitman.texi
415
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
416
417
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
427
- $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
428
- mv $@+ $@
418
+ $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
419
420
howto-index.txt: howto-index.sh $(HOWTO_TXT)
431
- $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
432
- mv $@+ $@
421
+ $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@
422
423
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
424
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
@@ -440,8 +429,7 @@ howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
429
$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
430
$(QUIET_ASCIIDOC) \
431
sed -e '1,/^$$/d' $< | \
443
- $(TXT_TO_HTML) - >$@+ && \
444
- mv $@+ $@
432
+ $(TXT_TO_HTML) - >$@
433
434
install-webdoc : html
435
'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
@@ -482,4 +470,7 @@ doc-l10n install-l10n::
470
$(MAKE) -C po $@
471
endif
472
473
+# Delete the target file on error
474
+.DELETE_ON_ERROR:
475
+
476
.PHONY: FORCE