From b97bbbaed7f4e377e8f3535f1af94e38ab881349 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 1 Aug 2013 11:19:05 +0200 Subject: [PATCH] doc: prefer the ".gv" extension to ".dot" See http://marc.info/?l=graphviz-devel&m=129418103126092 for the motivation (basically, some word processor now uses *.dot). * doc/figs/example-reduce.dot: Rename as... * doc/figs/example-reduce.gv: this. * doc/figs/example-shift.dot: Rename as... * doc/figs/example-shift.gv: this. * doc/figs/example.dot: Rename as... * doc/figs/example.gv: this. * doc/local.mk: Adjust. --- .../{example-reduce.dot => example-reduce.gv} | 0 .../{example-shift.dot => example-shift.gv} | 0 doc/figs/{example.dot => example.gv} | 0 doc/local.mk | 28 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) rename doc/figs/{example-reduce.dot => example-reduce.gv} (100%) rename doc/figs/{example-shift.dot => example-shift.gv} (100%) rename doc/figs/{example.dot => example.gv} (100%) diff --git a/doc/figs/example-reduce.dot b/doc/figs/example-reduce.gv similarity index 100% rename from doc/figs/example-reduce.dot rename to doc/figs/example-reduce.gv diff --git a/doc/figs/example-shift.dot b/doc/figs/example-shift.gv similarity index 100% rename from doc/figs/example-shift.dot rename to doc/figs/example-shift.gv diff --git a/doc/figs/example.dot b/doc/figs/example.gv similarity index 100% rename from doc/figs/example.dot rename to doc/figs/example.gv diff --git a/doc/local.mk b/doc/local.mk index afd50dd1..c3a35d3b 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -23,9 +23,9 @@ doc_bison_TEXINFOS = \ # 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=.png) +$(doc_bison).dvi: $(FIGS_GV:.gv=.eps) +$(doc_bison).pdf: $(FIGS_GV:.gv=.pdf) +$(doc_bison).html: $(FIGS_GV:.gv=.png) TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d -I doc CLEANDIRS = doc/bison.t2d @@ -124,25 +124,25 @@ nodist_man_MANS = doc/yacc.1 ## ----------------------------- ## CLEANDIRS += doc/figs -FIGS_DOT = \ - doc/figs/example.dot \ - doc/figs/example-reduce.dot doc/figs/example-shift.dot -EXTRA_DIST += \ - $(FIGS_DOT) \ - $(FIGS_DOT:.dot=.eps) $(FIGS_DOT:.dot=.pdf) $(FIGS_DOT:.dot=.png) -SUFFIXES += .dot .eps .pdf .png - -.dot.eps: +FIGS_GV = \ + doc/figs/example.gv \ + doc/figs/example-reduce.gv doc/figs/example-shift.gv +EXTRA_DIST += \ + $(FIGS_GV) \ + $(FIGS_GV:.gv=.eps) $(FIGS_GV:.gv=.pdf) $(FIGS_GV:.gv=.png) +SUFFIXES += .gv .eps .pdf .png + +.gv.eps: $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'` $(AM_V_at) $(DOT) -Gmargin=0 -Teps $< >$@.tmp $(AM_V_at) mv $@.tmp $@ -.dot.pdf: +.gv.pdf: $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'` $(AM_V_at) $(DOT) -Gmargin=0 -Tpdf $< >$@.tmp $(AM_V_at) mv $@.tmp $@ -.dot.png: +.gv.png: $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'` $(AM_V_at) $(DOT) -Gmargin=0 -Tpng $< >$@.tmp $(AM_V_at) mv $@.tmp $@ -- 2.45.2