From 324d1aec665aa43783758be7c72cfe5bbf38e5ba Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Fern=C3=A1ndez-Sanguino?=
 <javier.fernandez-sanguino@projectaon.org>
Date: Wed, 20 Jul 2016 17:32:42 +0000
Subject: [PATCH] Make it possible to add a verbose level in commands to see
 issues when executing the Makefile

git-svn-id: https://projectaon.org/data/trunk@2549 f6f3e2d7-ff33-0410-aaf5-b4bee2cdac11
---
 common/pdf/build/lw/Makefile.common | 79 +++++++++++++++--------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/common/pdf/build/lw/Makefile.common b/common/pdf/build/lw/Makefile.common
index fae08de..5ad02cc 100644
--- a/common/pdf/build/lw/Makefile.common
+++ b/common/pdf/build/lw/Makefile.common
@@ -19,6 +19,11 @@ ORIGSERIES ?= $(SERIES)
 # Define ILLUSTRATOR if not defined with a sane default
 ILLUSTRATOR ?= williams
 
+# Control debug
+AT_0 := @
+AT_1 := 
+AT = $(AT_$(VERBOSE))
+
 all: $(BASENAME).pdf 
 
 SOURCE=$(BASENAME).tex
@@ -33,13 +38,13 @@ endif
 # Generate the LaTeX file from the XML file
 $(SOURCE): $(XMLFILE) $(XML2LATEX) $(LATEXXSL) tweak.diff
 	AONPATH="$(AONROOTDIR)" perl $(XML2LATEX) $(BASENAME) $(BLANG) $@
-	@if ! test -s $(SOURCE) ; then \
+	$(AT)if ! test -s $(SOURCE) ; then \
 		echo "ERROR: Empty file $(SOURCE), check for errors above."  >&2 ; \
 		rm -f $(SOURCE) ; \
 		exit 1 ; \
 	fi
-	@cp $(SOURCE) $(BASENAME)-untweaked.tex
-	@if test -f tweak.diff; then \
+	$(AT)cp $(SOURCE) $(BASENAME)-untweaked.tex
+	$(AT)if test -f tweak.diff; then \
 		patch $(SOURCE) <tweak.diff ; \
 	fi
 
@@ -78,24 +83,24 @@ souverbt.sty:
 	ln -s ../../shared/$@
 # Create empty tweak.diff if it does not exist
 tweak.diff:
-	@touch tweak.diff
+	$(AT)touch tweak.diff
 
 # Symlink the images needed for the PDF; unused images and HTML-specific images are ignored
 link-images:
-	@[ -n "$(SERIES)" ] || { echo "Error: SERIES variable not defined. Hint: Review the Makefile"; exit 1; }
-	@[ -n "$(SUBSERIES)" ] || { echo "Error: SUBSERIES variable not defined. Hint: Review the Makefile"; exit 1; }
-	@[ -n "$(BASENAME)" ] || { echo "Error: BASENAME variable not defined. Hint: Review the Makefile"; exit 1; }
-	@echo "Linking images for the book to working directory"
-	@[ -n "$(ILLUSTRATOR)" ] || { echo "Warning: ILLUSTRATOR variable not defined. Some illustrations might be missing. Hint: Review the Makefile"; }
-	@[ ! -n "$(ILLUSTRATOR)" ] || [ -d "$(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR)" ] || \
+	$(AT)[ -n "$(SERIES)" ] || { echo "Error: SERIES variable not defined. Hint: Review the Makefile"; exit 1; }
+	$(AT)[ -n "$(SUBSERIES)" ] || { echo "Error: SUBSERIES variable not defined. Hint: Review the Makefile"; exit 1; }
+	$(AT)[ -n "$(BASENAME)" ] || { echo "Error: BASENAME variable not defined. Hint: Review the Makefile"; exit 1; }
+	$(AT)echo "Linking images for the book to working directory"
+	$(AT)[ -n "$(ILLUSTRATOR)" ] || { echo "Warning: ILLUSTRATOR variable not defined. Some illustrations might be missing. Hint: Review the Makefile"; }
+	$(AT)[ ! -n "$(ILLUSTRATOR)" ] || [ -d "$(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR)" ] || \
 	{ echo "Warning: Folder $(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR) not found. Some illustrations might be missing."; }
-	@[ ! -n "$(ILLUSTRATOR)" ] || [ ! -d "$(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR)" ] || \
+	$(AT)[ ! -n "$(ILLUSTRATOR)" ] || [ ! -d "$(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR)" ] || \
 	find $(AONROOTREL)/common/pdf/$(ORIGSERIES)/common/ill/$(ILLUSTRATOR)/ -name "*.pdf" | \
 	while read file ; do \
 		[ -e "`basename $$file`" ] || ln -s $$file . ; \
 	done
 ifeq "$(BLANG)" "en"
-	@for images in jpeg png ; do \
+	$(AT)for images in jpeg png ; do \
 		[ ! -d "$(AONROOTREL)/en/$$images/$(SERIES)/$(BASENAME)/" ] || find $(AONROOTREL)/en/$$images/$(SERIES)/$(BASENAME)/ \( -name "*.jpg" -o -name "*.png" \) | \
 		while read file ; do \
 			[ -e "`basename $$file`" ] || \
@@ -106,14 +111,14 @@ ifeq "$(BLANG)" "en"
 			esac ; \
 		done ; \
 	done
-	@[ ! -d "$(AONROOTREL)/en/pdf/$(SERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/en/pdf/$(SERIES)/$(SUBSERIES)/ -name "*.pdf" | \
+	$(AT)[ ! -d "$(AONROOTREL)/en/pdf/$(SERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/en/pdf/$(SERIES)/$(SUBSERIES)/ -name "*.pdf" | \
 	while read file ; do \
 		[ -e "`basename $$file`" ] || ln -s $$file . ; \
 	done
 else
-	@[ -n "$(ORIGSERIES)" ] || { echo "Error: ORIGSERIES variable not defined. Hint: Review the Makefile"; exit 1; }
-	@[ -n "$(ORIGBASENAME)" ] || { echo "Error: ORIGBASENAME variable not defined. Hint: Review the Makefile"; exit 1; }
-	@for images in jpeg png ; do \
+	$(AT)[ -n "$(ORIGSERIES)" ] || { echo "Error: ORIGSERIES variable not defined. Hint: Review the Makefile"; exit 1; }
+	$(AT)[ -n "$(ORIGBASENAME)" ] || { echo "Error: ORIGBASENAME variable not defined. Hint: Review the Makefile"; exit 1; }
+	$(AT)for images in jpeg png ; do \
 		[ ! -d "$(AONROOTREL)/$(BLANG)/$$images/$(SERIES)/$(BASENAME)/" ] || find $(AONROOTREL)/$(BLANG)/$$images/$(SERIES)/$(BASENAME)/ \( -name "*.jpg" -o -name "*.png" \) | \
 		while read file ; do \
 			[ -e "`basename $$file`" ] || ln -s $$file . ; \
@@ -124,11 +129,11 @@ else
 			[ -e "$$rootname.jpg" ] || [ -e "$$rootname.png" ] || ln -s $$file . ; \
 		done ; \
 	done
-	@[ ! -d "$(AONROOTREL)/$(BLANG)/pdf/$(SERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/$(BLANG)/pdf/$(SERIES)/$(SUBSERIES)/ -name "*.pdf" | \
+	$(AT)[ ! -d "$(AONROOTREL)/$(BLANG)/pdf/$(SERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/$(BLANG)/pdf/$(SERIES)/$(SUBSERIES)/ -name "*.pdf" | \
 	while read file ; do \
 		[ -e "`basename $$file`" ] || ln -s $$file . ; \
 	done
-	@[ ! -d "$(AONROOTREL)/en/pdf/$(ORIGSERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/en/pdf/$(ORIGSERIES)/$(SUBSERIES)/ -name "*.pdf" | \
+	$(AT)[ ! -d "$(AONROOTREL)/en/pdf/$(ORIGSERIES)/$(SUBSERIES)" ] || find $(AONROOTREL)/en/pdf/$(ORIGSERIES)/$(SUBSERIES)/ -name "*.pdf" | \
 	while read file ; do \
 		[ -e "`basename $$file`" ] || ln -s $$file . ; \
 	done
@@ -137,14 +142,14 @@ endif
 
 # Convert them using the appropiate script
 convert-images: link-images
-	@echo "Converting images to PDF format"
-	@sh ../../convert-images.sh
+	$(AT)echo "Converting images to PDF format"
+	$(AT)sh ../../convert-images.sh
 	touch $@
 	
 # Final install dir
 install: $(INSTALLDIR) all
-	@echo "Copying $(BASENAME).pdf to $(INSTALLDIR)"
-	@cp $(BASENAME).pdf $(INSTALLDIR)
+	$(AT)echo "Copying $(BASENAME).pdf to $(INSTALLDIR)"
+	$(AT)cp $(BASENAME).pdf $(INSTALLDIR)
 
 $(INSTALLDIR):
 	mkdir $@
@@ -166,28 +171,28 @@ dvi: $(BASENAME).dvi
 pdf: $(BASENAME).pdf 
 %.pdf: %.tex $(EXTRAFILES) convert-images
 # Convert to UTF-8 if required
-	@if file $< | grep -q ISO-8859 ; then \
+	$(AT)if file $< | grep -q ISO-8859 ; then \
 		echo "WARNING: $< is encoded in ISO-8859-1, converting to UTF-8" ; \
 		mv $< $<.lat1;  \
 		iconv -f latin1 -t utf-8 < $<.lat1  >$<; \
 	fi
 	-xelatex -interaction batchmode $<
 #	# Remove everything except for chapter entries from the toc file
-	@[ -e "$(BASENAME).toc" ] || { echo "ERROR: Generated file does not include table of contents file, please review $(BASENAME).log" ; false ; }
-	@grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc
+	$(AT)[ -e "$(BASENAME).toc" ] || { echo "ERROR: Generated file does not include table of contents file, please review $(BASENAME).log" ; false ; }
+	-$(AT)grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc
 #	# Run xelatex a second time to get correct page numbers in the toc
 	-xelatex -interaction batchmode $<
 #	# Remove everything except for chapter entries from the toc file
-	@grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc 
+	-$(AT)grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc 
 #	# Tweak the PDF bookmarks file
-	@[ -e "$(BASENAME).out" ] || { echo "ERROR: Required file $(BASENAME).out does not exist, please review $(BASENAME).log" ; false ; }
-	@sed 's/\\ellipsis@one =,//' $(BASENAME).out >temp.out && \
+	$(AT)[ -e "$(BASENAME).out" ] || { echo "ERROR: Required file $(BASENAME).out does not exist, please review $(BASENAME).log" ; false ; }
+	$(AT)sed 's/\\ellipsis@one =,//' $(BASENAME).out >temp.out && \
 		echo '\let\WriteBookmarks\relax' >>temp.out && \
 		mv -f temp.out $(BASENAME).out
 #	# Run xelatex a third time to get correct PDF bookmarks
 	-xelatex -interaction batchmode $<
 # Restore the original ISO-8859-1 file if we used iconf
-	@[ -e "$<.lat1" ] && mv $<.lat1 $<
+	$(AT)[ ! -e "$<.lat1" ] || mv $<.lat1 $<
 
 pdflatex: $(BASENAME).tex $(EXTRAFILES) convert-images
 #	# Remove old PDF bookmarks file (.out file)
@@ -195,15 +200,15 @@ pdflatex: $(BASENAME).tex $(EXTRAFILES) convert-images
 #	# Use pdflatex for generation:
 	-pdflatex -interaction batchmode $<
 #	# Remove everything except for chapter entries from the toc file
-	@[ -e "$(BASENAME).toc" ] || { echo "ERROR: Generated file does not include table of contents file, please review $(BASENAME).log" ; false ; }
-	@grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc
+	$(AT)[ -e "$(BASENAME).toc" ] || { echo "ERROR: Generated file does not include table of contents file, please review $(BASENAME).log" ; false ; }
+	$(AT)grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc
 #	# Run pdflatex a second time to get correct page numbers in the toc
 	-pdflatex -interaction batchmode $<
 #	# Remove everything except for chapter entries from the toc file
-	@grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc 
+	$(AT)grep '{chapter}' $(BASENAME).toc >temp.toc && mv -f temp.toc $(BASENAME).toc 
 #	# Tweak the PDF bookmarks file
-	@[ -e "$(BASENAME).out" ] || { echo "ERROR: Required file $(BASENAME).out does not exist, please review $(BASENAME).log" ; false ; }
-	@sed 's/\\ellipsis@one =,//' $(BASENAME).out >temp.out && \
+	$(AT)[ -e "$(BASENAME).out" ] || { echo "ERROR: Required file $(BASENAME).out does not exist, please review $(BASENAME).log" ; false ; }
+	$(AT)sed 's/\\ellipsis@one =,//' $(BASENAME).out >temp.out && \
 		echo '\let\WriteBookmarks\relax' >>temp.out && \
 		mv -f temp.out $(BASENAME).out
 #	# Run pdflatex a third time to get correct PDF bookmarks
@@ -217,9 +222,9 @@ distclean: clean
 	-rm -f $(BASENAME).tex $(BASENAME)-untweaked.tex $(BASENAME).tex.orig $(BASENAME).tex.lat1 $(BASENAME).tex.rej
 # Clean symlinks
 	-rm -f ac1.tex  ac2.tex ac3.tex crtneg.tex  crtpos.tex  random.tex souvenir.sty souverbt.sty    
-	@for gif in *.gif ; do [ -e $$gif ] && [ -L $$gif ] && rm -f $$gif ; done  || true
+	$(AT)for gif in *.gif ; do [ -e $$gif ] && [ -L $$gif ] && rm -f $$gif ; done  || true
 # Remove tweak file if empty
-	@test -s tweak.diff || rm -f tweak.diff
+	$(AT)test -s tweak.diff || rm -f tweak.diff
 
 # Clean all images
 clean-images:
@@ -228,7 +233,7 @@ clean-images:
 
 # Update tweak.diff with the current difference between untweaked and tweaked tex file
 update-tweakfile:
-	@if [ -e $(BASENAME)-untweaked.tex -a -e $(BASENAME).tex ] ; then \
+	$(AT)if [ -e $(BASENAME)-untweaked.tex -a -e $(BASENAME).tex ] ; then \
 		if ! diff -q $(BASENAME)-untweaked.tex $(BASENAME).tex; then \
 			diff -u $(BASENAME)-untweaked.tex $(BASENAME).tex >tweak.diff || echo Updated tweak.diff; \
 		else  \
-- 
2.17.1