Remove examples/local.mk.

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b1e2669004ea8766ddec27d1d17df2a01ba5d6d2..3362bd6ff9246822eb7260cd86c1e64a098040ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
 ## Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -17,19 +17,24 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
+SUBDIRS = po runtime-po lib data src doc tests etc
+if BISON_CXX_WORKS
+SUBDIRS += examples/calc++
+endif
 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
-EXTRA_DIST = .prev-version .version Makefile.cfg Makefile.maint maint.mk \
+EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
   OChangeLog 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
 
+include build-aux/local.mk
+include examples/local.mk
 
 .PHONY: maintainer-check
 maintainer-check:
@@ -43,9 +48,17 @@ maintainer-push-check:
 maintainer-xml-check:
        cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
 
-# See comments in build-aux/git-version-gen.
+# 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
+# working copy (for example, when you run autoreconf && make).  Allowing these
+# to fall out of sync appears to have little potential to improve Bison build
+# efficiency (even if we were to replace VERSION/PACKAGE_VERSION with .version
+# everywhere possible).  On the other hand, it could be harmful.  For example,
+# 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
-$(top_srcdir)/.version:
+$(top_srcdir)/.version: configure
        echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version