From: Alain D D Williams <addw@phcomp.co.uk>
Date: Mon, 24 Aug 2020 18:00:14 +0000 (+0100)
Subject: Try to explain what is going on, simplify
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a778be37af3b33fe42520e3c01973f1170b02569;p=libresoc-isa-manual.git

Try to explain what is going on, simplify
---

diff --git a/powerpc-add/build/Makefile b/powerpc-add/build/Makefile
index 593d22d..b204024 100644
--- a/powerpc-add/build/Makefile
+++ b/powerpc-add/build/Makefile
@@ -1,6 +1,6 @@
-#=======================================================================
+# =======================================================================
 # Makefile for generating LaTeX documents
-#-----------------------------------------------------------------------
+# -----------------------------------------------------------------------
 #
 # This is a simple makefile for generating LaTeX documents. It will
 # run bibtex, generate eps from xfig figures, and make pdfs. The
@@ -29,6 +29,8 @@ srcdir    = src
 # Relative to output:
 relsrcdir = ../$(srcdir)
 
+doc_target = power-spec
+
 docs_with_bib = power-spec
 docs_without_bib =
 
@@ -40,8 +42,10 @@ bibs = $(srcdir)/power-spec.bib
 # You shouldn't need to change anything below this
 #=======================================================================
 
+# : needed after ../src/ in TEXINPUTS so that it looks in standard places
 PDFLATEX := TEXINPUTS=$(relsrcdir): pdflatex -interaction=nonstopmode -halt-on-error
 BIBTEX := BIBINPUTS=$(relsrcdir): bibtex
+GLOSSARIES := makeglossaries
 
 default : $(outdir) pdf
 
@@ -50,7 +54,7 @@ default : $(outdir) pdf
 
 pdfs_with_bib = $(addsuffix .pdf, $(docs_with_bib))
 pdfs_without_bib = $(addsuffix .pdf, $(docs_without_bib))
-pdfs = $(pdfs_with_bib) $(pdfs_without_bib)
+pdfs = $(pdfs_with_bib)
 
 Makefile:	build/Makefile
 	ln -s $^ .
@@ -64,12 +68,16 @@ $(outdir):
 open: $(pdfs)
 	open $(pdfs)
 
+# This is not nice. To generate the glossary you need a .aux file,
+# .aux is generated by pdflatex - which complains as there are undefined names
+# Also if \gls are used in glossary.tex before they are defined - there are
+# similar problems, so makeglossaries needs to be run twice.
 $(pdfs_with_bib): %.pdf: $(srcdir)/%.tex $(srcs) $(figs) $(bibs)
-	cd $(outdir); $(PDFLATEX) $* || true
-	cd $(outdir); $(BIBTEX) $* || true
-	cd $(outdir); $(PDFLATEX) $* || true
-	cd $(outdir); makeglossaries $* || true
-	cd $(outdir); $(PDFLATEX) $* || true
+	cd $(outdir); $(PDFLATEX) $(doc_target)
+	cd $(outdir); $(BIBTEX) $(doc_target)
+	cd $(outdir); $(GLOSSARIES) $(doc_target)
+	cd $(outdir); $(PDFLATEX) $(doc_target)
+	cd $(outdir); $(GLOSSARIES) $(doc_target)
 
 $(pdfs_without_bib): %.pdf: $(srcdir)/%.tex $(srcs) $(figs)
 	cd $(outdir); $(PDFLATEX) $* || true