build: fix distcheck

Now that distcheck no longer fails (see previous commit), let's
address the shortcomings.

* Makefile.am (CLEANDIRS, clean-local): New.
* doc/local.mk, examples/calc++/local.mk, examples/local.mk,
* examples/mfcalc/local.mk, examples/rpcalc/local.mk,
* src/local.mk
(CLEANDIRS): Get rid of Apple's *.dSYM directories.
(CLEANFILES): Get rid of *.output files.
* examples/variant-11.yy, examples/variant.yy: Don't generate
any of the auxiliary files (location.hh and the like).

Makefile.am

@@ -43,6 +43,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
 # instead of "-Ilib" avoids infinite recursions on #include_next.
 AM_CPPFLAGS = -I. -I./lib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =
+CLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST += $(dist_TESTS)
@@ -64,6 +65,9 @@ include lib/local.mk
 include src/local.mk
 include tests/local.mk
 
+clean-local:
+	rm -rf $(CLEANDIRS)
+
 # 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

doc/local.mk

@@ -30,9 +30,7 @@ $(doc_bison).pdf: $(FIGS_GV:.gv=.pdf)
 $(doc_bison).html: $(FIGS_GV:.gv=.png)
 
 TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d -I doc
-CLEANDIRS = doc/bison.t2d
+CLEANDIRS += doc/bison.t2d
-clean-local:
-	rm -rf $(CLEANDIRS)
 
 MOSTLYCLEANFILES += $(top_srcdir)/doc/*.t
 

examples/calc++/local.mk

@@ -36,7 +36,7 @@ CLEANFILES +=					\
   %D%/parser.output				\
   %D%/parser.stamp				\
   %D%/scanner.cc
-
+CLEANDIRS += %D%/*.dSYM
 
 ## -------------------- ##
 ## Building & testing.  ##

examples/local.mk

@@ -65,6 +65,9 @@ if ENABLE_CXX11
   %D%/variant-11.cc: $(BISON_IN) $(dist_pkgdata_DATA)
 endif
 
+CLEANFILES += %D%/variant.output %D%/variant-11.output
+CLEANDIRS += %D%/*.dSYM
+
 include %D%/calc++/local.mk
 include %D%/mfcalc/local.mk
 include %D%/rpcalc/local.mk

examples/mfcalc/local.mk

@@ -20,6 +20,7 @@
 
 BUILT_SOURCES += $(mfcalc_sources)
 CLEANFILES +=  %D%/mfcalc.[ch] %D%/mfcalc.output
+CLEANDIRS += %D%/*.dSYM
 
 mfcalc_extracted = %D%/calc.h %D%/mfcalc.y
 mfcalc_sources = $(mfcalc_extracted)

examples/rpcalc/local.mk

@@ -20,6 +20,7 @@
 
 BUILT_SOURCES += $(rpcalc_sources)
 CLEANFILES +=  %D%/rpcalc.[ch] %D%/rpcalc.output
+CLEANDIRS += %D%/*.dSYM
 
 rpcalc_extracted = %D%/rpcalc.y
 rpcalc_sources = $(rpcalc_extracted)

examples/variant-11.yy

@@ -17,10 +17,10 @@
 
 %debug
 %language "c++"
-%defines
 %define api.token.constructor
 %define api.value.type variant
 %define api.value.automove
+%define api.location.file none
 %define parse.assert
 %locations
 

examples/variant.yy

@@ -17,9 +17,9 @@
 
 %debug
 %language "c++"
-%defines
 %define api.token.constructor
 %define api.value.type variant
+%define api.location.file none
 %define parse.assert
 %locations
 

src/local.mk

@@ -116,6 +116,7 @@ bin_SCRIPTS = src/yacc
 endif
 EXTRA_SCRIPTS = src/yacc
 MOSTLYCLEANFILES += src/yacc
+CLEANDIRS += %D%/*.dSYM
 
 src/yacc:
 	$(AM_V_GEN)rm -f $@ $@.tmp