[groff] 09/33: arch, src/preproc: - fix clean and mostlyclean targets - fix dist target

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake2
in repository groff.

commit 20fcf238b69b6c4a03b211e2097e2ce52c933fbb
Author: Bertrand Garrigues <address@hidden>
Date:   Thu Aug 21 23:56:10 2014 +0200

    arch, src/preproc:
      - fix clean and mostlyclean targets
      - fix dist target
---
 Makefile.am                    |    3 ++-
 TESTS                          |   26 +++++++++++++++++---------
 arch/misc/misc.am              |    2 ++
 src/preproc/eqn/eqn.am         |   10 ++++++++++
 src/preproc/grn/grn.am         |    2 +-
 src/preproc/pic/pic.am         |    6 ++++++
 src/preproc/preconv/preconv.am |    2 +-
 src/preproc/refer/refer.am     |    5 +++++
 src/preproc/soelim/soelim.am   |    3 +++
 src/preproc/tbl/tbl.am         |    2 +-
 10 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 08ae3ae..eb19bc7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -586,7 +586,8 @@ EXTRA_DIST += \
   MORE.STUFF \
   PROBLEMS \
   PROJECTS \
-  README.MinGW
+  README.MinGW \
+  arch/djgpp
 
 MOSTLYCLEANFILES += $(man1_MANS)
 
diff --git a/TESTS b/TESTS
index f9c2577..9f5d6e8 100644
--- a/TESTS
+++ b/TESTS
@@ -125,9 +125,7 @@ were built from a clean environment:
 
 2.2 make clean
 
-  TODO: src/preproc
-
-The following files remains (this is expected):
+The following files remain (this is expected):
   - Makefile
   - config.status
   - config.log
@@ -136,6 +134,8 @@ The following files remains (this is expected):
   - .deps directories and .dirstamp files
 
   - .n files, afmtodit are cleaned
+  - shdeps.sed is cleaned
+  - binaries from bin_PROGRAMS are cleaned
 
 2.3 make mostlyclean
 
@@ -145,6 +145,12 @@ The following files remains (this is expected):
     version.cpp.
   - gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h
 
+Differences with former build system:
+
+  - Programs (listed in bin_PROGRAMS) are not cleaned by 'make
+    mostlyclean'. This could be changed if needed (MOSTLYCLEANFILES +=
+    $(bin_PROGRAMS)).
+
 2.4 make distclean
 
   Like 'make clean', but the following files are also cleaned:
@@ -196,11 +202,9 @@ The following files remains (this is expected):
   - $(DESTDIR)/usr/local/share/groff/1.22/
   - $(DESTDIR)/usr/local/share/groff/
   
-
 2.8 make dist
 
-  groff-1.22.2.tar.gz is generated. src/libs .c, .cpp and .am files
-  are present.
+  groff-1.22.2.tar.gz is generated.
 
   - Files/directories that are not distributed on purpose:
     .gitignore
@@ -212,14 +216,12 @@ The following files remains (this is expected):
     TESTS
 
   - Missing files/directories (TODO):
-    arch/
     contrib/
     doc/
     font/
     man/
     src/devices
     src/include (except config.hin and include.am)
-    src/preproc
     src/roff
     tmac
     test-groff.in
@@ -234,7 +236,13 @@ The following files remains (this is expected):
     Makefile.in
     aclocal.m4
     configure   
-
+    src/preproc/eqn/eqn.cpp
+    src/preproc/eqn/eqn.hpp
+    src/preproc/pic/pic.cpp
+    src/preproc/pic/pic.hpp 
+    src/preproc/refer/label.hpp
+    src/preproc/refere/label.cpp
+    
 2.9 make distcheck
   
   - configure fails: src/roff/groff/groff.cpp is missing (passed to
diff --git a/arch/misc/misc.am b/arch/misc/misc.am
index 792bb2b..87911ea 100644
--- a/arch/misc/misc.am
+++ b/arch/misc/misc.am
@@ -17,6 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
+EXTRA_DIST += arch/misc/shdeps.sh
+MOSTLYCLEANFILES += shdeps.sed
 
 shdeps.sed: $(top_srcdir)/arch/misc/shdeps.sh
        $(SHELL) $(top_srcdir)/arch/misc/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" 
"$(bindir)" > $@
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index a91bf11..4c9fe48 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -44,8 +44,18 @@ eqn_SOURCES = \
   src/preproc/eqn/eqn.h
 
 man1_MANS += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
+EXTRA_DIST += \
+  src/preproc/eqn/TODO \
+  src/preproc/eqn/neqn.sh \
+  src/preproc/eqn/eqn.man \
+  src/preproc/eqn/neqn.man
 
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
+CLEANFILES += \
+  src/preproc/eqn/eqn.hpp \
+  src/preproc/eqn/eqn.cpp \
+  src/preproc/eqn/eqn.output
+MOSTLYCLEANFILES += neqn
 
 neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT)
        rm -f $@
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 72c6052..2aa7e65 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -8,4 +8,4 @@ grn_SOURCES = \
 src/preproc/grn/main.$(OBJEXT): defs.h
 grn_LDADD = lib/libgnu.a libgroff.a $(LIBM)
 man1_MANS += src/preproc/grn/grn.n
-
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index 176f9ce..16ec882 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -39,3 +39,9 @@ pic_CPPFLAGS = $(AM_CPPFLAGS) \
 man1_MANS += src/preproc/pic/pic.n
 
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
+EXTRA_DIST += src/preproc/pic/pic.n src/preproc/pic/TODO
+CLEANFILES += \
+  src/preproc/pic/pic.cpp \
+  src/preproc/pic/pic.hpp \
+  src/preproc/pic/pic.output
+
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index 4ee1fea..fe028f7 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -2,4 +2,4 @@ bin_PROGRAMS += preconv
 preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
 preconv_SOURCES = src/preproc/preconv/preconv.cpp
 man1_MANS += src/preproc/preconv/preconv.n
-
+EXTRA_DIST += src/preproc/preconv/preconv.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 3522509..4700a41 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -30,6 +30,11 @@ refer_SOURCES =  \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
 man1_MANS += src/preproc/refer/refer.n
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
+CLEANFILES += \
+  src/preproc/refer/label.cpp \
+  src/preproc/refer/label.hpp \
+  src/preproc/refer/label.output
 # As refer_CPPFLAGS was set, all the .o have a 'refer-' prefix
 src/preproc/refer/refer-command.$(OBJEXT): defs.h
 src/preproc/refer/refer-ref.$(OBJEXT): defs.h
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index 503ce14..9b3a906 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -2,3 +2,6 @@ bin_PROGRAMS += soelim
 soelim_LDADD = libgroff.a $(LIBM)
 soelim_SOURCES = src/preproc/soelim/soelim.cpp
 man1_MANS += src/preproc/soelim/soelim.n
+EXTRA_DIST += \
+  src/preproc/soelim/TODO \
+  src/preproc/soelim/soelim.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index 0cbc3d7..4794f1d 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -5,4 +5,4 @@ tbl_SOURCES = \
   src/preproc/tbl/table.cpp \
   src/preproc/tbl/table.h
 man1_MANS += src/preproc/tbl/tbl.n
-
+EXTRA_DIST += src/preproc/tbl/tbl.man