doc: fix build dependencies

Suggested by Nick Bowler
<http://lists.gnu.org/archive/html/bug-automake/2012-12/msg00001.html>

* doc/local.mk: Avoid overwriting Automake's rules.

diff --git a/THANKS b/THANKS
index ed15fa02e7071567797aecfbd6b3cd67fb5bedd5..06ee9eddf87b803654febae0c55ed990f7b61b39 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -81,6 +81,7 @@ Mickael Labau             labau_m@epita.fr
 Mike Castle               dalgoda@ix.netcom.com
 Neil Booth                NeilB@earthling.net
 Nelson H. F. Beebe        beebe@math.utah.edu
 Mike Castle               dalgoda@ix.netcom.com
 Neil Booth                NeilB@earthling.net
 Nelson H. F. Beebe        beebe@math.utah.edu

+Nick Bowler               nbowler@elliptictech.com

 Nicolas Burrus            nicolas.burrus@epita.fr
 Nicolas Tisserand         nicolas.tisserand@epita.fr
 Noah Friedman             friedman@gnu.org
 Nicolas Burrus            nicolas.burrus@epita.fr
 Nicolas Tisserand         nicolas.tisserand@epita.fr
 Noah Friedman             friedman@gnu.org

diff --git a/doc/local.mk b/doc/local.mk
index aaea996d1245ded69c0be1f75e41ffe05426c1cc..cef4448c4e89ef61a4819c9a6809eb4b3029fdb2 100644 (file)
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -20,7 +20,14 @@ doc_bison_TEXINFOS =                            \
   doc/fdl.texi                                  \
   doc/gpl-3.0.texi
 
   doc/fdl.texi                                  \
   doc/gpl-3.0.texi
 

-TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d
+# Cannot express dependencies directly on file names because of Automake.
+# Obfuscate with a variable.
+doc_bison = doc/bison
+$(doc_bison).dvi: $(FIGS_DOT:.dot=.eps)
+$(doc_bison).pdf: $(FIGS_DOT:.dot=.pdf)
+$(doc_bison).html: $(FIGS_DOT:.dot=.html)
+
+TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d -I doc

 CLEANDIRS = doc/bison.t2d
 clean-local:
        rm -rf $(CLEANDIRS)
 CLEANDIRS = doc/bison.t2d
 clean-local:
        rm -rf $(CLEANDIRS)


@@ -123,10 +130,6 @@ EXTRA_DIST +=                                                              \
   $(FIGS_DOT:.dot=.eps) $(FIGS_DOT:.dot=.pdf) $(FIGS_DOT:.dot=.png)
 SUFFIXES += .dot .eps .pdf .png
 
   $(FIGS_DOT:.dot=.eps) $(FIGS_DOT:.dot=.pdf) $(FIGS_DOT:.dot=.png)
 SUFFIXES += .dot .eps .pdf .png
 

-doc/bison.dvi:  $(FIGS_DOT:.dot=.eps)
-doc/bison.html: $(FIGS_DOT:.dot=.png)
-doc/bison.pdf:  $(FIGS_DOT:.dot=.pdf)
-

 .dot.eps:
        $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`
        $(AM_V_at) $(DOT) -Gmargin=0 -Teps $< >$@.tmp
 .dot.eps:
        $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`
        $(AM_V_at) $(DOT) -Gmargin=0 -Teps $< >$@.tmp