X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e8b1fb9b991d72f290e69aaeb5a2b58caa8b5349..847480ae0f5f105ae86d8990729916c589427552:/doc/Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a97af2bf..1d393d43 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
 ## 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-2011 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
@@ -25,9 +26,12 @@ clean-local:
 
 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
+	mv -f $@ $@~ || : >$@~
+	-rm -f $@.tmp
 	cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
-	$(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL) >$@.tmp
+	$(top_builddir)/src/bison --help \
+	  | perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+	diff -u $@~ $@.tmp || true
 	mv $@.tmp $@
 MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
 
@@ -53,20 +57,15 @@ dist_man_MANS = $(srcdir)/bison.1
 EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
 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
 
-# Output from --help and --version that must not appear in the man page.
-neutralize = \
-  perl -0777 -pi -e 's/\.PP\nId:.*\n//g'
-
 # Differences to ignore when comparing the man page (the date).
 remove_time_stamp = \
   sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
 
-
 MOSTLYCLEANFILES = $(srcdir)/*.t
 
 SUFFIXES = .x .1
@@ -88,7 +87,6 @@ PREPATH = $(top_builddir)/src
 	    --include=$*.x						     \
 	    --include=$(srcdir)/common.x				     \
 	    --output=$@.t `echo '$*' | sed 's,.*/,,'`
-	$(neutralize) $@.t
 	if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&		     \
 	   $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then     \
 		touch $@;						     \
@@ -97,6 +95,7 @@ PREPATH = $(top_builddir)/src
 	fi
 	rm -f $@*.t
 
+nodist_man_MANS = yacc.1
 
 ## -------------- ##
 ## Doxygenation.  ##
@@ -111,8 +110,7 @@ doc: html
 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'
@@ -121,10 +119,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.
-# 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`; \
+Doxyfile: $(srcdir)/Doxyfile.in
 	$(edit) $(srcdir)/Doxyfile.in >Doxyfile
 
 CLEANDIRS += html latex