Merge remote-tracking branch 'origin/branch-2.6' into maint

[bison.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9cf734c8614c1a88ca6a6e354eeb2c1042ccf5cc..9c9c24ca77794e5bd09eadebd56b7c56e3b32b90 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+## Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -15,31 +16,34 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_MAKEINFOFLAGS = --no-split
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_MAKEINFOFLAGS = --no-split

-info_TEXINFOS = bison.texinfo
-bison_TEXINFOS = cross-options.texi gpl-3.0.texi fdl.texi
-
-CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
-$(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
-       -rm -f $@ $@.tmp
-       cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
-       $(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL) >$@.tmp
-       mv $@.tmp $@
+info_TEXINFOS = bison.texi
+bison_TEXINFOS = $(srcdir)/cross-options.texi gpl-3.0.texi fdl.texi

 
 CLEANFILES = bison.fns
 CLEANDIRS = *.t2d
 clean-local:
        rm -rf $(CLEANDIRS)
 
 
 CLEANFILES = bison.fns
 CLEANDIRS = *.t2d
 clean-local:
        rm -rf $(CLEANDIRS)
 

+CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
+$(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
+       $(AM_V_GEN)mv -f $@ $@~ || : >$@~
+       $(AM_V_at)rm -f $@.tmp
+       $(AM_V_at)cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
+       $(AM_V_at)$(top_builddir)/src/bison --help \
+         | $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+       $(AM_V_at)diff -u $@~ $@.tmp || true
+       $(AM_V_at)mv $@.tmp $@
+MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
+

 ## ---------- ##
 ## Ref card.  ##
 ## ---------- ##
 
 EXTRA_DIST = refcard.tex
 ## ---------- ##
 ## Ref card.  ##
 ## ---------- ##
 
 EXTRA_DIST = refcard.tex

-

 CLEANFILES += refcard.dvi refcard.log refcard.ps
 
 refcard.dvi: refcard.tex
 CLEANFILES += refcard.dvi refcard.log refcard.ps
 
 refcard.dvi: refcard.tex

-       tex refcard.tex
+       $(AM_V_GEN)tex refcard.tex

 
 refcard.ps: refcard.dvi
 
 
 refcard.ps: refcard.dvi
 


@@ -51,14 +55,16 @@ refcard.ps: refcard.dvi
 dist_man_MANS = $(srcdir)/bison.1
 
 EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
 dist_man_MANS = $(srcdir)/bison.1
 
 EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x

-MAINTAINERCLEANFILES = $(dist_man_MANS)
+MAINTAINERCLEANFILES += $(dist_man_MANS)

 
 

-# Depend on configure.ac to get version number changes.
-common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
+# Depend on configure to get version number changes.
+common_dep = $(top_srcdir)/configure $(srcdir)/common.x

 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 
 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 

-remove_time_stamp = 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
+# Differences to ignore when comparing the man page (the date).
+remove_time_stamp = \
+  sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'

 
 MOSTLYCLEANFILES = $(srcdir)/*.t
 
 
 MOSTLYCLEANFILES = $(srcdir)/*.t
 


@@ -66,7 +72,7 @@ SUFFIXES = .x .1
 
 PREPATH = $(top_builddir)/src
 .x.1:
 
 PREPATH = $(top_builddir)/src
 .x.1:

-       @program=`expr "/$*" : '.*/\(.*\)'` &&                          \
+       $(AM_V_GEN)program=`expr "/$*" : '.*/\(.*\)'` &&                \

        save_IFS=$IFS;                                                  \
        IFS=$(PATH_SEPARATOR);                                          \
        for dir in $(PREPATH); do                                       \
        save_IFS=$IFS;                                                  \
        IFS=$(PATH_SEPARATOR);                                          \
        for dir in $(PREPATH); do                                       \


@@ -74,21 +80,51 @@ PREPATH = $(top_builddir)/src
          echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program &&       \
          (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit;      \
        done
          echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program &&       \
          (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit;      \
        done

-       @echo "Updating man page $@"
-       PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";                            \
+       $(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH";                  \

        export PATH;                                                         \
        $(HELP2MAN)                                                          \
            --include=$*.x                                                   \
            --include=$(srcdir)/common.x                                     \
            --output=$@.t `echo '$*' | sed 's,.*/,,'`
        export PATH;                                                         \
        $(HELP2MAN)                                                          \
            --include=$*.x                                                   \
            --include=$(srcdir)/common.x                                     \
            --output=$@.t `echo '$*' | sed 's,.*/,,'`

-       if sed $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&                 \
-          sed $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
+       $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&           \
+          $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then     \

                touch $@;                                                    \
        else                                                                 \
                mv $@.t $@;                                                  \
        fi
                touch $@;                                                    \
        else                                                                 \
                mv $@.t $@;                                                  \
        fi

-       rm -f $@*.t
+       $(AM_V_at)rm -f $@*.t
+
+nodist_man_MANS = yacc.1
+
+## ----------------------------- ##
+## Graphviz examples generation. ##
+## ----------------------------- ##
+
+CLEANDIRS += figs
+FIGS_DOT = figs/example-reduce.dot 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
+
+bison.dvi:  $(FIGS_DOT:.dot=.eps)
+bison.html: $(FIGS_DOT:.dot=.png)
+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
+       $(AM_V_at) mv $@.tmp $@
+
+.dot.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:
+       $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`
+       $(AM_V_at) $(DOT) -Gmargin=0 -Tpng $< >$@.tmp
+       $(AM_V_at) mv $@.tmp $@

 
 ## -------------- ##
 ## Doxygenation.  ##
 
 ## -------------- ##
 ## Doxygenation.  ##


@@ -103,8 +139,7 @@ doc: html
 html-local: Doxyfile
        $(DOXYGEN)
 
 html-local: Doxyfile
        $(DOXYGEN)
 

-edit = sed -e "s|@ID@|$$Id|" \
-          -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \

           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'


@@ -113,10 +148,7 @@ EXTRA_DIST += Doxyfile.in
 CLEANFILES += Doxyfile
 # Sed is used to generate Doxyfile from Doxyfile.in instead of
 # configure, because the former is way faster than the latter.
 CLEANFILES += Doxyfile
 # Sed is used to generate Doxyfile from Doxyfile.in instead of
 # configure, because the former is way faster than the latter.

-# Moreover, this file is updated whenever ChangeLog is touched: using
-# sed instead of configure saves us a lot of time.
-Doxyfile: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile.in
-       Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \
-       $(edit) $(srcdir)/Doxyfile.in >Doxyfile
+Doxyfile: $(srcdir)/Doxyfile.in
+       $(AM_V_GEN)$(edit) $(srcdir)/Doxyfile.in >Doxyfile

 
 CLEANDIRS += html latex
 
 CLEANDIRS += html latex