grep branch, master, updated. v2.19-5-g085f98b

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  085f98bba131b708bf68e7162f19324629e3263a (commit)
      from  6fea170e2f1f936202657c0c4aaf842c672b72e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=085f98bba131b708bf68e7162f19324629e3263a


commit 085f98bba131b708bf68e7162f19324629e3263a
Author: Paul Eggert <address@hidden>
Date:   Sat May 24 13:38:15 2014 -0700

    dist: don't distribute lib/colorize.c
    
    'configure' creates this file, so it shouldn't be distributed; see:
    http://bugs.gnu.org/17480
    * configure.ac (COLORIZE_SOURCE): New macro.
    Don't use AC_CONFIG_LINKS for lib/colorize.c.
    * lib/Makefile.am (nodist_libgreputils_a_SOURCES): New macro.
    (libgreputils_a_SOURCES): Remove colorize.c.
    (CLEANFILES): Add colorize.c
    (colorize.c): New rule.

diff --git a/configure.ac b/configure.ac
index c301ebe..7ac2937 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,8 @@ case $host_os in
   mingw*) suffix=w32 ;;
   *) suffix=posix ;;
 esac
-AC_CONFIG_LINKS([lib/colorize.c:lib/colorize-$suffix.c])
+COLORIZE_SOURCE=colorize-$suffix.c
+AC_SUBST([COLORIZE_SOURCE])
 
 AC_CONFIG_FILES([
   Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dc41fbf..f9e5444 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,10 +29,12 @@ include gnulib.mk
 
 AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 
-libgreputils_a_SOURCES += \
-  colorize.c colorize.h
-
+nodist_libgreputils_a_SOURCES = colorize.c
+libgreputils_a_SOURCES += colorize.h
 EXTRA_DIST += colorize-posix.c colorize-w32.c
+CLEANFILES += colorize.c
+colorize.c:
+       $(AM_V_GEN)echo '#include <$(COLORIZE_SOURCE)>' >$@
 
 libgreputils_a_LIBADD += $(LIBOBJS) $(ALLOCA)
 libgreputils_a_DEPENDENCIES += $(LIBOBJS) $(ALLOCA)

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |    3 ++-
 lib/Makefile.am |    8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep