[groff] 11/46: Fix `clean' and `dist' rules in src/devices/*.

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake3
in repository groff.

commit 50ac6c89cb1b238c8317f9baecee1398f2579015
Author: Bertrand Garrigues <address@hidden>
Date:   Sun Aug 24 00:34:56 2014 +0200

    Fix `clean' and `dist' rules in src/devices/*.
---
 Makefile.am                      |    2 +-
 TESTS                            |    5 -----
 src/devices/grodvi/grodvi.am     |    2 +-
 src/devices/grohtml/grohtml.am   |    1 +
 src/devices/grolbp/grolbp.am     |    1 +
 src/devices/grolj4/grolj4.am     |    4 +++-
 src/devices/gropdf/gropdf.am     |   10 ++++++++++
 src/devices/grops/grops.am       |    5 ++++-
 src/devices/grotty/grotty.am     |    4 +++-
 src/devices/xditview/xditview.am |   26 +++++++++++++++++++++++++-
 10 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1976dff..c59a34c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -601,7 +601,7 @@ EXTRA_DIST += \
   README.MinGW \
   arch/djgpp
 
-MOSTLYCLEANFILES += $(man1_MANS)
+MOSTLYCLEANFILES += $(man1_MANS) $(man5_MANS)
 
 # Rule to build .man files. The brackets around the @ are used to prevent the 
 # substitution of the variable by automake. 
diff --git a/TESTS b/TESTS
index 8e02b85..1baebc9 100644
--- a/TESTS
+++ b/TESTS
@@ -146,8 +146,6 @@ were built from a clean environment:
 
 2.2 make clean
 
-TODO: src/devices
-
 The following files remain (this is expected):
   - Makefile
   - config.status
@@ -162,8 +160,6 @@ The following files remain (this is expected):
 
 2.3 make mostlyclean
 
-TODO: src/devices
-
   Like 'make clean', but the following files also remain (expected):
   - lib*.a
   - libgroff.a's charset.alias, ref-add.sed, ref-del.sed, and
@@ -249,7 +245,6 @@ TODO: src/devices specific rules
     doc/
     font/
     man/
-    src/devices
     src/include (except config.hin and include.am)
     src/roff
     tmac
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index b03eca5..ba0e0ed 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.am
@@ -23,6 +23,6 @@ grodvi_LDADD = \
   libgroff.a \
   lib/libgnu.a $(LIBM)
 man1_MANS += src/devices/grodvi/grodvi.n
-
+EXTRA_DIST += src/devices/grodvi/grodvi.man
 
 
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index e5ec154..68c59f1 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.am
@@ -31,3 +31,4 @@ post_grohtml_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a 
 man1_MANS += src/devices/grohtml/grohtml.n
+EXTRA_DIST += src/devices/grohtml/grohtml.man
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index 0c81977..987bbeb 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.am
@@ -27,3 +27,4 @@ grolbp_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grolbp/grolbp.n
+EXTRA_DIST += src/devices/grolbp/grolbp.man
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index bf70d80..6f81545 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.am
@@ -24,5 +24,7 @@ grolj4_LDADD = $(LIBM) \
   lib/libgnu.a
 man1_MANS += src/devices/grolj4/grolj4.n
 man5_MANS += src/devices/grolj4/lj4_font.n
-
+EXTRA_DIST += \
+  src/devices/grolj4/grolj4.man \
+  src/devices/grolj4/lj4_font.man
 
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index c64081f..24a6769 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -21,11 +21,21 @@
 gropdf_dir = $(top_srcdir)/src/devices/gropdf
 
 bin_SCRIPTS += gropdf pdfmom
+EXTRA_DIST += \
+  src/devices/gropdf/TODO \
+  src/devices/gropdf/gropdf.pl \
+  src/devices/gropdf/pdfmom.pl \
+  src/devices/gropdf/gropdf.man \
+  src/devices/gropdf/pdfmom.man
 
 man1_MANS += \
   src/devices/gropdf/gropdf.n \
   src/devices/gropdf/pdfmom.n
 
+MOSTLYCLEANFILES += \
+  gropdf \
+  pdfmom
+
 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
        $(RM) $@
        sed -f $(SH_DEPS_SED_SCRIPT) \
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index 2bc6817..6a62cf7 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.am
@@ -26,4 +26,7 @@ grops_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grops/grops.n
-
+EXTRA_DIST += \
+  src/devices/grops/grops.man \
+  src/devices/grops/psfig.diff \
+  src/devices/grops/TODO
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 3a91868..d3e36b8 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -23,4 +23,6 @@ grotty_LDADD = $(LIBM) \
   libgroff.a \
   lib/libgnu.a
 man1_MANS += src/devices/grotty/grotty.n
-
+EXTRA_DIST += \
+  src/devices/grotty/grotty.man \
+  src/devices/grotty/TODO
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index 1ffb099..2f00206 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -37,7 +37,10 @@ gxditview_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) -Dlint \
 gxditview_LDADD = $(X_LIBS) $(X_PRE_LIBS) -lXaw -lXmu -lXt -lX11 \
   $(X_EXTRA_LIBS) $(LIBM) libxutil.a
 XDITVIEW_GENHDRS = src/devices/xditview/GXditview-ad.h
-gxditview_SOURCES = $(GXDITVIEWSOURCES) $(XDITVIEW_GENHDRS)
+gxditview_SOURCES = $(GXDITVIEWSOURCES)
+nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
+CLEANFILES += $(XDITVIEW_GENHDRS)
+
 man1_MANS += src/devices/xditview/gxditview.n
 
 # Because we defined gxditview_CPPFLAGS, automake renames all the xditview's 
@@ -48,3 +51,24 @@ src/devices/xditview/gxditview-xditview.$(OBJEXT): 
$(XDITVIEW_GENHDRS)
 src/devices/xditview/GXditview-ad.h: $(xditview_srcdir)/GXditview.ad
        @echo Making $@
        $(SHELL) $(xditview_srcdir)/ad2c $(xditview_srcdir)/GXditview.ad > $@
+
+EXTRA_DIST += \
+  src/devices/xditview/ad2c \
+  src/devices/xditview/ChangeLog \
+  src/devices/xditview/DESC.in \
+  src/devices/xditview/FontMap \
+  src/devices/xditview/GXditview-color.ad \
+  src/devices/xditview/GXditview.ad \
+  src/devices/xditview/README \
+  src/devices/xditview/TODO \
+  src/devices/xditview/gray1.bm \
+  src/devices/xditview/gray2.bm \
+  src/devices/xditview/gray3.bm \
+  src/devices/xditview/gray4.bm \
+  src/devices/xditview/gray5.bm \
+  src/devices/xditview/gray6.bm \
+  src/devices/xditview/gray7.bm \
+  src/devices/xditview/gray8.bm \
+  src/devices/xditview/xdit.bm \
+  src/devices/xditview/xdit_mask.bm \
+  src/devices/xditview/gxditview.man
\ No newline at end of file