Il 15/05/2014 14:34, Norihiro Tanaka ha scritto:
* src/Makefile.am (bin_PROGRAMS): Add egrep, fgrep. (bin_SCRIPTS): Remove it. (grep_SOURCES): Move searchutils.c, dfa.c, dfasearch.c, kwset.c, kwsearch.c, pcresearch.c here to libgrep_a_SOURCES. (egrep_SOURCES, fgrep_SOURCES): New macro. (noinst_LIBRARIES): Add libgrep.a. (libgrep_a_SOURCES): Move searchutils.c, dfa.c, dfasearch.c, kwset.c, kwsearch.c, pcresearch.c here from grep_SOURCES. (LDADD): Add libgrep.a. (egrep, fgrep): Use rule of grep. (CLEANFILES): Remove macro. * src/grep.c (SELECTED_MATCHER, DEFAULT_MATCHER): New macro. (do_execute, usage, matchers, main): Use them. * src/egrep.c: Define SELECTED_MATCHER macro for egrep. * src/fgrep.c: Define SELECTED_MATCHER macro for fgrep. ---
I disagree a bit with introducing subtle changes over the 2.18 logic. Also, the large diff makes it hard to review the changes (both their logic and their merit).
We should apply the basic revert patch, and then do cleanups on top. Paolo
