[groff] 04/46: Fix make clean, mostlyclean, distclean (maintainer-clean works like distclean for the moment)

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake3
in repository groff.

commit ec8a19e9e822885f47df250a9a87f25d5e1981f7
Author: Bertrand Garrigues <address@hidden>
Date:   Sun Aug 17 12:04:16 2014 +0200

    Fix make clean, mostlyclean, distclean (maintainer-clean works like
    distclean for the moment)
---
 TESTS                         |   40 ++++++++++++++++++++++++++++++++--------
 src/include/include.am        |    1 +
 src/libs/libgroff/libgroff.am |    6 ++++++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/TESTS b/TESTS
index 7012582..3cfcd62 100644
--- a/TESTS
+++ b/TESTS
@@ -68,25 +68,48 @@ were built from a clean environment:
 2.2 make clean
 
 The following files remains (this is expected):
+  - Makefile
+  - config.status
+  - config.log
   - src/include/config.h
   - src/include/stamp-h1
   - .deps directories and .dirstamp files
 
-TODO: following files should be cleaned:
-  - libgroff extra files and version.cpp
-
 2.3 make mostlyclean
 
-  Like 'make clean', but:
-  - lib*.a remain
+  Like 'make clean', but the following files also remain (expected):
+  - lib*.a
+  - libgroff.a's charset.alias, ref-add.sed, ref-del.sed, and
+    version.cpp.
+  - gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h
 
-2.4 make dist-clean
+2.4 make distclean
 
-  To be checked
+  Like 'make clean', but the following files are also cleaned:
+  - Makefile
+  - config.status
+  - config.log
+  - src/include/config.h
+  - src/include/stamp-h1
+  - .deps directories and .dirstamp files
+
+  In a out-of-source build, nothing remains in the build directory
+  expect empty directories.
+
+  The files generated by bootstrap and needed by the configure script
+  are untouched:
+  INSTALL
+  Makefile.in
+  aclocal.m4
+  build-aux/
+  configure
+  gnulib_m4/
+  lib/
+  src/include/config.hin
 
 2.5 make maintainer-clean
 
-  To be checked
+  Like 'make distclean'
 
 2.6 make install
 
@@ -133,6 +156,7 @@ TODO: following files should be cleaned:
 2.9 make distcheck
   
   - fails (src/libs sources are missing)
+
 Notes
 -----
 
diff --git a/src/include/include.am b/src/include/include.am
index 8241fc7..9074c5f 100644
--- a/src/include/include.am
+++ b/src/include/include.am
@@ -21,6 +21,7 @@
 ########################################################################
 
 nodist_noinst_HEADERS = defs.h
+CLEANFILES += defs.h
 defs.h:
        @$(SHELL) $(top_srcdir)/gendef.sh defs.h \
        "PROG_PREFIX=\"$(g)\"" \
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.am
index 66f8f8c..2fcc9bd 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -79,6 +79,12 @@ nodist_libgroff_a_SOURCES = src/libs/libgroff/version.cpp
 src_version=`cat $(top_srcdir)/VERSION`
 src_revision=`cat $(top_srcdir)/REVISION`
 
+CLEANFILES += \
+  src/libs/libgroff/version.cpp \
+  charset.alias \
+  ref-add.sed \
+  ref-del.sed
+
 # .o files have a 'libgroff_a-' prefix because we set libgroff_a_CPPFLAGS
 src/libs/libgroff/libgroff_a-device.$(OBJEXT): defs.h
 src/libs/libgroff/libgroff_a-fontfile.$(OBJEXT): defs.h