[groff] 01/01: Always distribute the parts of groff that require X11.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit 5ba79c91218196ebfc386095ecf71c616799ceef
Author: Colin Watson <address@hidden>
Date:   Wed Oct 15 08:17:36 2014 +0200

    Always distribute the parts of groff that require X11.
    
    * Makefile.in (ALLLIBDIRS): Clone from `LIBDIRS', but include
    src/devices/libxutil unconditionally.
    (ALLPROGDIRS): Clone from `PROGDIRS', but include
    src/devices/xditview and src/utils/xtotroff unconditionally.
    (DISTDIRS): Use `ALLLIBDIRS' and `ALLPROGDIRS' rather than `LIBDIRS'
    and `PROGDIRS'.
---
 ChangeLog   |   11 +++++++++++
 Makefile.in |   16 ++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 19aa0b9..5c8429a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-10-15  Colin Watson  <address@hidden>
+
+       Always distribute the parts of groff that require X11.
+
+       * Makefile.in (ALLLIBDIRS): Clone from `LIBDIRS', but include
+       src/devices/libxutil unconditionally.
+       (ALLPROGDIRS): Clone from `PROGDIRS', but include
+       src/devices/xditview and src/utils/xtotroff unconditionally.
+       (DISTDIRS): Use `ALLLIBDIRS' and `ALLPROGDIRS' rather than `LIBDIRS'
+       and `PROGDIRS'.
+
 2014-10-14  Keith Marshall  <address@hidden>
 
        Minor update to NEWS for pdfroff.
diff --git a/Makefile.in b/Makefile.in
index 139d7cb..4dd82ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -625,6 +625,11 @@ LIBDIRS=\
   src/libs/libdriver \
   src/libs/libbib \
   $(XLIBDIRS)
+ALLLIBDIRS=\
+  src/libs/libgroff \
+  src/libs/libdriver \
+  src/libs/libbib \
+  src/libs/libxutil
 CCPROGDIRS=\
   src/roff/groff \
   src/roff/troff \
@@ -660,6 +665,13 @@ PROGDIRS=\
   $(CPROGDIRS) \
   $(SHPROGDIRS) \
   $(XPROGDIRS)
+ALLPROGDIRS=\
+  $(PROGDEPDIRS) \
+  $(CCPROGDIRS) \
+  $(CPROGDIRS) \
+  $(SHPROGDIRS) \
+  src/devices/xditview \
+  src/utils/xtotroff
 DEVDIRS=\
   font/devps \
   font/devdvi \
@@ -735,8 +747,8 @@ GNULIBDIRS=\
   src/libs/gnulib
 DISTDIRS=\
   $(INCDIRS) \
-  $(LIBDIRS) \
-  $(PROGDIRS) \
+  $(ALLLIBDIRS) \
+  $(ALLPROGDIRS) \
   $(DEVDIRS) \
   $(XDEVDIRS) \
   $(OTHERDEVDIRS) \