Refactor: Rename locating-rule.[hc].

* gettext-tools/src/locating-rules.h: Renamed from gettext-tools/src/locating-rule.h.
* gettext-tools/src/locating-rules.c: Renamed from gettext-tools/src/locating-rule.c.
* gettext-tools/src/FILES: Update.
* gettext-tools/src/Makefile.am (noinst_HEADERS, libgettextsrc_la_SOURCES): Update.
* gettext-tools/src/msgfmt.c: Update.
* gettext-tools/src/xgettext.c: Update.
* gettext-tools/po/POTFILES.in: Update.

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index 8897b8fdaebc76d7c08139160b739f12f9f4cc67..e528d821f87b836f46e8fde4472393d246c4a603 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -69,7 +69,7 @@ src/format-tcl.c
 src/hostname.c
 src/if-error.c
 src/its.c
-src/locating-rule.c
+src/locating-rules.c
 src/msgattrib.c
 src/msgcat.c
 src/msgcmp.c

diff --git a/gettext-tools/src/FILES b/gettext-tools/src/FILES
index 8b6f9604af2c439bef8cf37a0915674866df5a7d..72754a2bbc4931ec9c07745e6674daf8df1e36eb 100644 (file)
--- a/gettext-tools/src/FILES
+++ b/gettext-tools/src/FILES
@@ -274,8 +274,8 @@ msgl-check.c
 | search-path.h
 | search-path.c
 |               Search path for locating *.loc and *.its files.
-| locating-rule.h
-| locating-rule.c
+| locating-rules.h
+| locating-rules.c
 |               Determining the appropriate *.its file for a given input.
 | its.h
 | its.c

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 2c8be3891b710d52d2976879147a218e5fa75000..2cdedfb252e868b40e200177bc797b4ce59d2f01 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -50,7 +50,7 @@ noinst_HEADERS = \
   str-list.h \
   write-catalog.h write-po.h write-properties.h write-stringtable.h \
   dir-list.h file-list.h read-po-gram.h cldr-plural.h \
-  cldr-plural-exp.h locating-rule.h its.h search-path.h \
+  cldr-plural-exp.h locating-rules.h its.h search-path.h \
   msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-ofn.h msgl-cat.h \
   msgl-header.h msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
   plural-count.h plural-eval.h plural-distrib.h \
@@ -224,7 +224,7 @@ libgettextsrc_la_SOURCES = \
   sentence.h sentence.c \
   $(FORMAT_SOURCE) \
   read-desktop.c \
-  locating-rule.c its.c \
+  locating-rules.c its.c \
   search-path.c
 
 # msggrep needs pattern matching.

diff --git a/gettext-tools/src/locating-rule.c b/gettext-tools/src/locating-rules.c
similarity index 99%
rename from gettext-tools/src/locating-rule.c
rename to gettext-tools/src/locating-rules.c
index 1c34355c760285ed43c40fb690cb27472d0e58e4..72efb331fc3c480393e06f58dffe25c0acd20886 100644 (file)
--- a/gettext-tools/src/locating-rule.c
+++ b/gettext-tools/src/locating-rules.c
@@ -21,7 +21,7 @@
 #endif
 
 /* Specification.  */
-#include "locating-rule.h"
+#include "locating-rules.h"
 
 #include <dirent.h>
 #include <errno.h>

diff --git a/gettext-tools/src/locating-rule.h b/gettext-tools/src/locating-rules.h
similarity index 100%
rename from gettext-tools/src/locating-rule.h
rename to gettext-tools/src/locating-rules.h

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index e0819489e2f2cb32ffefb255c7e391ccd1d61471..0ea1fde4a45e7d4d5f01d2de79ffe0fdec2979c2 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -67,7 +67,7 @@
 #include "msgl-iconv.h"
 #include "concat-filename.h"
 #include "its.h"
-#include "locating-rule.h"
+#include "locating-rules.h"
 #include "search-path.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 989bbcade9d1e9a80ce43486274456577152c5ce..178a9023dacd50efbc8aec20dec88b81d57cd295 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -89,7 +89,7 @@
 #include "propername.h"
 #include "sentence.h"
 #include "its.h"
-#include "locating-rule.h"
+#include "locating-rules.h"
 #include "search-path.h"
 #include "gettext.h"