[groff] 15/33: - src/roff: -- Fix make dist (missing files, majorminor.cpp should not be distributed) - Distribute all .h in src/include - 'make distcheck' now works correctly

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake2
in repository groff.

commit 63ad1269d8f27149b075775be5916d4b09a784e4
Author: Bertrand Garrigues <address@hidden>
Date:   Wed Aug 27 00:31:22 2014 +0200

      - src/roff:
        -- Fix make dist (missing files, majorminor.cpp should not be
           distributed)
      - Distribute all .h in src/include
      - 'make distcheck' now works correctly
---
 TESTS                   |    7 +------
 src/include/include.am  |    4 ++++
 src/roff/groff/groff.am |    1 +
 src/roff/grog/grog.am   |    3 +++
 src/roff/nroff/nroff.am |    3 +++
 src/roff/troff/troff.am |    9 +++++++--
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/TESTS b/TESTS
index 6a0d7eb..8e3b684 100644
--- a/TESTS
+++ b/TESTS
@@ -246,8 +246,6 @@ Differences with former build system:
   
 2.8 make dist
 
-TODO: missing files from src/roff
-
   groff-1.22.2.tar.gz is generated.
 
   - Files/directories that are not distributed on purpose:
@@ -264,8 +262,6 @@ TODO: missing files from src/roff
     doc/
     font/
     man/
-    src/include (except config.hin and include.am)
-    src/roff
     tmac
     test-groff.in
 
@@ -295,8 +291,7 @@ the install tree).
 
   make distcheck DESTDIR=~/tmp/automake
 
-  - configure script passed without error
-  - build of src/libs fails (lib.h missing)
+  - All phases now succeed
 
 Notes
 -----
diff --git a/src/include/include.am b/src/include/include.am
index 6105f54..dc0ab66 100644
--- a/src/include/include.am
+++ b/src/include/include.am
@@ -14,3 +14,7 @@ defs.h:
        "DEFAULT_INDEX_NAME=\"$(indexname)\"" \
        "DEFAULT_INDEX=\"$(indexdir)/$(indexname)\""
 
+dist-hook: dist_include
+dist_include:
+       chmod u+w $(distdir)/src/include
+       cp -f $(top_srcdir)/src/include/*.h $(distdir)/src/include
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 4b21313..e067540 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -37,6 +37,7 @@ groff_SOURCES = \
   src/roff/groff/pipeline.h
 src/roff/groff/groff.$(OBJEXT): defs.h
 man1_MANS += src/roff/groff/groff.n
+EXTRA_DIST += src/roff/groff/groff.man
 GROFF_OPTS_OUTPUT = \
   groff_opts_no_arg.txt \
   groff_opts_with_arg.txt
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
index c67ece9..0c56410 100644
--- a/src/roff/grog/grog.am
+++ b/src/roff/grog/grog.am
@@ -30,6 +30,9 @@ GROG = src/roff/grog/subs.pl
 grogdir = $(grog_dir)
 dist_grog_DATA = $(GROG)
 man1_MANS += src/roff/grog/grog.n
+EXTRA_DIST += \
+  src/roff/grog/grog.man \
+  src/roff/grog/grog.pl
 
 MOSTLYCLEANFILES += grog
 
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index ddba3a3..92d1dad 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -1,6 +1,9 @@
 bin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
 man1_MANS += src/roff/nroff/nroff.n
+EXTRA_DIST += \
+  src/roff/nroff/nroff.man \
+  src/roff/nroff/nroff.sh
 
 MOSTLYCLEANFILES += nroff
 
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index b75899d..3c71302 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -18,6 +18,10 @@
 
 bin_PROGRAMS += troff
 man1_MANS += src/roff/troff/troff.n
+EXTRA_DIST += \
+  src/roff/troff/column.cpp \
+  src/roff/troff/troff.man \
+  src/roff/troff/TODO
 troff_LDADD = lib/libgnu.a libgroff.a $(LIBM)
 troff_SOURCES = \
   src/roff/troff/dictionary.cpp \
@@ -39,8 +43,9 @@ troff_SOURCES = \
   src/roff/troff/token.h \
   src/roff/troff/charinfo.h \
   src/roff/troff/request.h \
-  src/roff/troff/hvunits.h \
-  src/roff/troff/majorminor.cpp 
+  src/roff/troff/hvunits.h
+
+nodist_troff_SOURCES = src/roff/troff/majorminor.cpp 
 
 src/roff/troff/input.$(OBJEXT): defs.h
 CLEANFILES += src/roff/troff/majorminor.cpp