X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-rules.make;h=e0c0756bc403af37cb02b5a4f339c72d6ee5ed4a;hb=d59632089d2d25f321cefba94b4bc66d4d8011c6;hp=e5a03790b4ae37d9fee09a56aae7fa5303d8a122;hpb=350751e4016e846fd5f79b8b9d20efc4da8a0e95;p=lilypond.git

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index e5a03790b4..e0c0756bc4 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -15,7 +15,7 @@ $(outdir)/%.html:  %.xml
 ############## LaTeX ########################
 
 $(outdir)/%.tex:  %.lytex
-	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
+	$(buildscript-dir)/run-and-check "$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<"  "$*.lytex.log"
 
 $(outdir)/%.tex:  %.tex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
@@ -23,10 +23,16 @@ $(outdir)/%.tex:  %.tex
 $(outdir)/%.tex:  %.latex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
-# Add the tex => pdf rule only if we have dblatex
+# Add the tex => pdf rule only if we have pdflatex
 ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-	cd $(outdir) && $(PDFLATEX) $(notdir $<)
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
+ifeq ($(USE_EXTRACTPDFMARK),yes)
+	$(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
+	$(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
+	rm $@
+	mv $(outdir)/$*.final.pdf $@
+endif
 endif
 
 ############## Texinfo ######################
@@ -52,5 +58,11 @@ $(outdir)/%.xml:  %.lyxml
 # Add the xml => pdf rule only if we have dblatex
 ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.xml
-	cd $(outdir) && $(DBLATEX) $(notdir $<)
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(DBLATEX_BACKEND) $(notdir $<)" "$*.dblatex.log"
+ifeq ($(USE_EXTRACTPDFMARK),yes)
+	$(EXTRACTPDFMARK) -o $(outdir)/$*.pdfmark $@
+	$(GS920) -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$(outdir)/$*.final.pdf -c "30000000 setvmthreshold" -f $(top-build-dir)/out-fonts/*.font.ps $(outdir)/$*.pdfmark $@
+	rm $@
+	mv $(outdir)/$*.final.pdf $@
+endif
 endif