diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk
index e1813364..16f49c4f 100644
--- a/examples/calc++/local.mk
+++ b/examples/calc++/local.mk
@@ -17,8 +17,6 @@
 ## Parser generation.  ##
 ## ------------------- ##
 
-CLEANFILES += examples/calc++/calc++-parser.output *.tmp
-
 # Don't depend on $(BISON) otherwise we would rebuild these files
 # in srcdir, including during distcheck, which is forbidden.
 examples/calc++/calc++-parser.stamp: $(BISON_IN)
@@ -32,6 +30,11 @@ SUFFIXES += .yy .stamp
 $(calc_sources_generated): examples/calc++/calc++-parser.stamp
 	@test -f $@ || rm -f examples/calc++/calc++-parser.stamp
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/calc++/calc++-parser.stamp
+CLEANFILES += 					\
+  $(calc_sources_generated)			\
+  examples/calc++/calc++-parser.output		\
+  examples/calc++/calc++-parser.stamp		\
+  examples/calc++/calc++-scanner.cc
 
 
 ## -------------------- ##
diff --git a/examples/local.mk b/examples/local.mk
index 3924543c..24763a85 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -24,7 +24,7 @@ doc = $(top_srcdir)/doc/bison.texinfo
 extexi = $(top_srcdir)/examples/extexi
 extract = $(AWK) -f $(extexi) -v VERSION="$(VERSION)" $(doc) --
 extracted =
-MAINTAINERCLEANFILES += $(extracted)
+CLEANFILES += $(extracted) examples/extracted.stamp
 examples/extracted.stamp: $(doc) $(extexi)
 	$(AM_V_GEN)rm -f $@ $@.tmp
 	$(AM_V_at)touch $@.tmp
diff --git a/examples/mfcalc/local.mk b/examples/mfcalc/local.mk
index 9859945e..aa64d4c6 100644
--- a/examples/mfcalc/local.mk
+++ b/examples/mfcalc/local.mk
@@ -18,6 +18,7 @@
 ## -------------------- ##
 
 BUILT_SOURCES += $(mfcalc_sources)
+CLEANFILES +=  examples/mfcalc/mfcalc.[ch] examples/mfcalc/mfcalc.output
 
 mfcalc_extracted =				\
   examples/mfcalc/calc.h			\
diff --git a/examples/rpcalc/local.mk b/examples/rpcalc/local.mk
index 952bba18..5a87650a 100644
--- a/examples/rpcalc/local.mk
+++ b/examples/rpcalc/local.mk
@@ -18,6 +18,7 @@
 ## -------------------- ##
 
 BUILT_SOURCES += $(rpcalc_sources)
+CLEANFILES +=  examples/rpcalc/rpcalc.[ch] examples/rpcalc/rpcalc.output
 
 rpcalc_extracted =				\
   examples/rpcalc/rpcalc.y