doc: fixes in the C++ part

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index feb55681ee2bc7ab17239f803ada6a28467c082d..b6135cbd1700dde96a172263e59c6bde745770be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
 ## Process this file with automake to produce Makefile.in.
 

-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015 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


@@ -24,21 +24,24 @@ SUBDIRS = po runtime-po .
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 

-EXTRA_DIST = .prev-version .version \
-  cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
+EXTRA_DIST = .prev-version .version cfg.mk PACKAGING \
+  ChangeLog-1998 ChangeLog-2012 ChangeLog
+
+dist_doc_DATA = AUTHORS COPYING NEWS README THANKS TODO

 
 ## Running the bison from this tarball.  To generate our own parser,
 ## but also to run the tests.  Of course, you ought to keep a sane
 ## version of Bison nearby...
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
 
 ## Running the bison from this tarball.  To generate our own parser,
 ## but also to run the tests.  Of course, you ought to keep a sane
 ## version of Bison nearby...
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in

-YACC = $(BISON) -y
-AM_YFLAGS = -d -v --warnings=all,error --report=all
+YACC = $(BISON) -o y.tab.c
+AM_YFLAGS = -d -v -Werror -Wall -Wno-yacc --report=all

 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)
 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)

-# Find builddir/src/scan-code.c etc.
-AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
+# Find builddir/src/scan-code.c etc.  For some reason "-I./lib"
+# instead of "-Ilib" avoids infinite recursions on #include_next.
+AM_CPPFLAGS = -I. -I./lib -I$(top_srcdir) -I$(top_srcdir)/lib

 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =


@@ -78,21 +81,24 @@ dist-hook: gen-ChangeLog
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:

-       find data -type f                    \
-         | grep -v -E '^data/bison.m4$$'    \
-         | xargs $(build_aux)/$@
+       $(AM_V_GEN)find $(srcdir)/data -type f          \
+         | xargs $(srcdir)/build-aux/$@

        @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:
        @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:

-       $(build_aux)/$@ configure.ac
+       $(AM_V_GEN)$(srcdir)/build-aux/$@ $(srcdir)/configure.ac

 
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:

-       $(AM_V_GEN)if test -d .git; then                                \
-         $(top_srcdir)/build-aux/gitlog-to-changelog                   \
-           --no-cluster                                                \
-           --amend=$(srcdir)/build-aux/git-log-fix                     \
-           --since=$(gen_start_date) > $(distdir)/cl-t;                \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+       $(AM_V_GEN)if test -d $(srcdir)/.git; then      \
+         cl=$(distdir)/ChangeLog &&                    \
+         rm -f $$cl.tmp &&                             \
+         $(top_srcdir)/build-aux/gitlog-to-changelog   \
+           --strip-tab                                 \
+           --strip-cherry-pick                         \
+           --no-cluster                                \
+           --amend=$(srcdir)/build-aux/git-log-fix     \
+           --srcdir=$(srcdir)                          \
+           --since=$(gen_start_date) > $$cl.tmp &&     \
+         mv -f $$cl.tmp $$cl;                          \

        fi
        fi