diff options
| author | Joel E. Denny <jdenny@ces.clemson.edu> | 2008-07-27 15:49:04 -0400 |
|---|---|---|
| committer | Joel E. Denny <jdenny@ces.clemson.edu> | 2008-07-27 15:49:04 -0400 |
| commit | 78029cd561557cb28cc66856afd7cc7b96ea3470 (patch) | |
| tree | 6467a3ccc60036add355408dcf4a7a27ae018bda /doc | |
| parent | c53d18b1572c5b8f07cc8a71574257dc4edf3e1d (diff) | |
| download | bison-78029cd561557cb28cc66856afd7cc7b96ea3470.tar.gz | |
Remove remaining dependence on CVS Id keyword.
* ChangeLog: For the sake of people still using CVS, don't use dollars
when mentioning Id.
* data/xslt/bison.xsl: Remove Id from header comments, where it was
unusual anyway.
* data/xslt/xml2dot.xsl: Likewise.
* data/xslt/xml2text.xsl: Likewise.
* data/xslt/xml2xhtml.xsl: Likewise.
* doc/Doxyfile.in (PROJECT_NUMBER): Don't use ID.
* doc/Makefile.am (neutralize): Remove, no longer needed.
(.x.1): Don't use neutralize.
(edit): Don't substitute for ID.
(Doxyfile): Don't define Id, and thus don't depend on ChangeLog.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index ee9c4391..61274390 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -23,7 +23,7 @@ PROJECT_NAME = "@PACKAGE_NAME@" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "@PACKAGE_VERSION@ @ID@" +PROJECT_NUMBER = "@PACKAGE_VERSION@" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/Makefile.am b/doc/Makefile.am index 0dd43727..36370fca 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, 2002, 2003, 2005, 2006, 2007, 2008 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 @@ -58,10 +59,6 @@ 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/' @@ -87,7 +84,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 $@; \ @@ -111,8 +107,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 +116,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 |