* build-aux/Makefile.am: Ship cross-options.pl.

* doc/Makefile.am: Always refer to cross-options.texi with
$(srcdir).
(MAINTAINERCLEANFILES): Add it.

diff --git a/ChangeLog b/ChangeLog
index cbba5876c7b902041a6b2e9128191d187449a078..527a89551e0ef677d5c582692f08788d4f6caf46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-05  Akim Demaille  <demaille@gostai.com>
+
+       * build-aux/Makefile.am: Ship cross-options.pl.
+       * doc/Makefile.am: Always refer to cross-options.texi with
+       $(srcdir).
+       (MAINTAINERCLEANFILES): Add it.
+
 2007-11-04  Akim Demaille  <demaille@gostai.com>
 
        Generate the long/short option cross-table.

diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 0e2ef7ab58c5b73236c733d605469441991df113..2facd9dfef88e2512b9984d4eac7300f9b11b8e2 100644 (file)
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -1,2 +1,2 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-EXTRA_DIST = prev-version.txt
+EXTRA_DIST = prev-version.txt cross-options.pl

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9cf734c8614c1a88ca6a6e354eeb2c1042ccf5cc..2cbd2bc8246030d50b2659516d124e3400fdd6d3 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,12 @@
 
 AM_MAKEINFOFLAGS = --no-split
 info_TEXINFOS = bison.texinfo
-bison_TEXINFOS = cross-options.texi gpl-3.0.texi fdl.texi
+bison_TEXINFOS = $(srcdir)/cross-options.texi gpl-3.0.texi fdl.texi
+
+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)
@@ -24,18 +29,13 @@ $(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
        cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
        $(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL) >$@.tmp
        mv $@.tmp $@
-
-CLEANFILES = bison.fns
-CLEANDIRS = *.t2d
-clean-local:
-       rm -rf $(CLEANDIRS)
+MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
 
 ## ---------- ##
 ## Ref card.  ##
 ## ---------- ##
 
 EXTRA_DIST = refcard.tex
-
 CLEANFILES += refcard.dvi refcard.log refcard.ps
 
 refcard.dvi: refcard.tex
@@ -51,7 +51,7 @@ refcard.ps: refcard.dvi
 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