[PATCH 2/3] grep: rename files for intuitiveness

[Paolo Bonzini]

* Makefile.am (libgrep_a_SOURCES, grep_SOURCES, egrep_SOURCES,
fgrep_SOURCES): Adjust.
* grep.c: Rename to main.c.
* esearch.c: Rename to egrep.c.
* fsearch.c: Rename to fgrep.c.
* gsearch.c: Rename to grep.c.
* po/POTFILES.in: Adjust.
---
 po/POTFILES.in             |    8 ++++----
 src/Makefile.am            |    8 ++++----
 src/{esearch.c => egrep.c} |    0
 src/{fsearch.c => fgrep.c} |    0
 src/{gsearch.c => grep.c}  |    0
 src/{grep.c => main.c}     |    0
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{esearch.c => egrep.c} (100%)
 rename src/{fsearch.c => fgrep.c} (100%)
 rename src/{gsearch.c => grep.c} (100%)
 rename src/{grep.c => main.c} (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b047712..c0b9025 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,10 +24,10 @@ lib/regcomp.c
 lib/xalloc-die.c
 lib/xstrtol-error.c
 src/dfa.c
+src/dfasearch.c
+src/egrep.c
+src/fgrep.c
 src/grep.c
 src/kwset.c
-src/dfasearch.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
+src/main.c
 src/pcresearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a4f686f..5376b97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,14 +19,14 @@ LN = ln
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 bin_PROGRAMS = grep egrep fgrep
-grep_SOURCES  = gsearch.c
-egrep_SOURCES = esearch.c
-fgrep_SOURCES = fsearch.c
+grep_SOURCES  = grep.c
+egrep_SOURCES = egrep.c
+fgrep_SOURCES = fgrep.c
 noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
 
 noinst_LIBRARIES = libgrep.a
 libgrep_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
-       pcresearch.c grep.c
+       pcresearch.c main.c
 
 LDADD = $(LIBINTL) libgrep.a ../lib/libgreputils.a
 grep_LDADD = $(LDADD) $(PCRE_LIBS)
diff --git a/src/grep.c b/src/main.c
similarity index 100%
rename from src/grep.c
rename to src/main.c
diff --git a/src/esearch.c b/src/egrep.c
similarity index 100%
rename from src/esearch.c
rename to src/egrep.c
diff --git a/src/fsearch.c b/src/fgrep.c
similarity index 100%
rename from src/fsearch.c
rename to src/fgrep.c
diff --git a/src/gsearch.c b/src/grep.c
similarity index 100%
rename from src/gsearch.c
rename to src/grep.c
-- 
1.6.6.1