Merge remote-tracking branch 'origin/maint'

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5d3db28671d8f6523478e19a24a1304ecf0d02f..a98611901aab7d267c0e6e54a61e932fcc27b145 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-
-## Copyright (C) 2001-2012 Free Software Foundation, Inc.
+## Process this file with automake to produce Makefile.in.

 
 

+# Copyright (C) 2001-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
 # the Free Software Foundation, either version 3 of the License, or
 # 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
 # the Free Software Foundation, either version 3 of the License, or


@@ -15,29 +15,51 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

+AUTOMAKE_OPTIONS = subdir-objects

 ACLOCAL_AMFLAGS = -I m4
 
 ACLOCAL_AMFLAGS = -I m4
 

-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
+SUBDIRS = po runtime-po .

 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
 EXTRA_DIST = .prev-version .version \
 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
 EXTRA_DIST = .prev-version .version \

-  cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING \
-  djgpp/Makefile.maint djgpp/README.in djgpp/config.bat \
-  djgpp/config.sed djgpp/config.site djgpp/config_h.sed \
-  djgpp/subpipe.c djgpp/subpipe.h djgpp/djunpack.bat \
-  djgpp/fnchange.lst djgpp/testsuite.sed
+  cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
+
+## 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
+
+# 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
+BUILT_SOURCES =
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST += $(dist_TESTS)
+MOSTLYCLEANDIRS =
+MOSTLYCLEANFILES =
+SUFFIXES =
+TESTS = $(dist_TESTS)
+check_PROGRAMS =
+dist_TESTS =
+noinst_LIBRARIES =

 
 

-MAINTAINER_CHECKS =                            \
-  maintainer-check                             \
-  maintainer-push-check                                \
-  maintainer-xml-check                         \
-  maintainer-release-check
-.PHONY: $(MAINTAINER_CHECKS)
-$(MAINTAINER_CHECKS):
-       $(AM_V_GEN)cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+include build-aux/local.mk
+include data/local.mk
+include djgpp/local.mk
+include doc/local.mk
+include etc/local.mk
+include examples/local.mk
+include lib/local.mk
+include src/local.mk
+include tests/local.mk

 
 # See comments in build-aux/git-version-gen.  However, we make .version depend
 # on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
 
 # See comments in build-aux/git-version-gen.  However, we make .version depend
 # on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the


@@ -48,20 +70,20 @@ $(MAINTAINER_CHECKS):
 # a developer might naively reference .version in a test case while the bison
 # executable still compiles with VERSION, and so the test case might fail or
 # pass incorrectly.
 # a developer might naively reference .version in a test case while the bison
 # executable still compiles with VERSION, and so the test case might fail or
 # pass incorrectly.

-BUILT_SOURCES = $(top_srcdir)/.version
+BUILT_SOURCES += $(top_srcdir)/.version

 $(top_srcdir)/.version: configure
 $(top_srcdir)/.version: configure

-       $(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
+       echo $(VERSION) > $@-t && mv $@-t $@

 dist-hook: gen-ChangeLog
 dist-hook: gen-ChangeLog

-       $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+       echo $(VERSION) > $(distdir)/.tarball-version

 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:

-       $(AM_V_GEN) find data -type f           \
-         | grep -v -E '^data/bison.m4$$'       \
+       find data -type f                    \
+         | grep -v -E '^data/bison.m4$$'    \

          | xargs $(build_aux)/$@
        @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:
          | xargs $(build_aux)/$@
        @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:

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

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


@@ -74,6 +96,7 @@ gen-ChangeLog:
            --strip-cherry-pick                         \
            --no-cluster                                \
            --amend=$(srcdir)/build-aux/git-log-fix     \
            --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
            --since=$(gen_start_date) > $$cl.tmp &&     \
          mv -f $$cl.tmp $$cl;                          \
        fi