Rename read-po -> read-catalog, open-po -> open-catalog.

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 01887182a7ad15aef144540b86047a238af84a53..d025202ae3fc8ca79e6000e36488666e6ce291f8 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-15  Bruno Haible  <bruno@clisp.org>
+
+       * POTFILES.in: Add src/read-catalog.c, remove src/read-po.c.
+       Add src/open-catalog.c, remove src/open-po.c.
+
 2006-10-15  Bruno Haible  <bruno@clisp.org>
 
        * POTFILES.in: Add src/write-catalog.c.

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index 755bba6e3b607e233238a369513357ce39ff4d77..0939ad02f59f2f4e03a34aff0e2f6a0ed4f49cc5 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -68,15 +68,15 @@ src/msgl-iconv.c
 src/msgmerge.c
 src/msgunfmt.c
 src/msguniq.c
-src/open-po.c
+src/open-catalog.c
 src/po-charset.c
 src/po-gram-gen.y
 src/po-lex.c
 src/po-xerror.c
+src/read-catalog.c
 src/read-csharp.c
 src/read-java.c
 src/read-mo.c
-src/read-po.c
 src/read-properties.c
 src/read-resources.c
 src/read-stringtable.c

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 116e89ea41c55c679b18d8dc44413ee134cb5d2a..b976b26fca61db441e63e1a8c760df45b1662b51 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-15  Bruno Haible  <bruno@clisp.org>
+
+       * read-catalog-abstract.h: Renamed from read-po-abstract.h.
+       * read-catalog-abstract.c: Renamed from read-po-abstract.c.
+       * read-catalog.h: Renamed from read-po.h.
+       * read-catalog.c: Renamed from read-po.c.
+       * open-catalog.h: Renamed from open-po.h.
+       * open-catalog.c: Renamed from open-po.c.
+       * Makefile.am (noinst_HEADERS, COMMON_SOURCE, libgettextsrc_la_SOURCES):
+       Update.
+
 2006-10-15  Bruno Haible  <bruno@clisp.org>
 
        * write-catalog.h: New file.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 613f537cdcf34fe5b1f021de0e529f9504d4f748..e7d87ec073c0851def77b31058e450a344986d7f 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -37,8 +37,8 @@ lib_LTLIBRARIES = libgettextsrc.la libgettextpo.la
 nodist_include_HEADERS = gettext-po.h
 
 noinst_HEADERS = pos.h message.h po-error.h po-xerror.h po-gram.h po-charset.h \
-po-lex.h open-po.h \
-read-po-abstract.h read-po.h read-properties.h read-stringtable.h \
+po-lex.h open-catalog.h \
+read-catalog-abstract.h read-catalog.h read-properties.h read-stringtable.h \
 str-list.h \
 write-catalog.h write-po.h write-properties.h write-stringtable.h \
 dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h \
@@ -101,13 +101,13 @@ endif
 # All programs must read PO files. (msgunfmt also, for read-java.c,
 # read-csharp.c and read-resources.c.)
 # message.c -> str-list.c.
-# (read-po-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> str-list.c.
-# (read-po-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> open-po.c -> dir-list.c -> str-list.c.
-# (read-po-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> po-charset.c.
-# (read-po-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> message.c -> str-list.c.
+# (read-catalog-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> str-list.c.
+# (read-catalog-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> open-catalog.c -> dir-list.c -> str-list.c.
+# (read-catalog-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> po-charset.c.
+# (read-catalog-abstract.c <--> po-gram-gen.y <--> po-lex.c) -> message.c -> str-list.c.
 COMMON_SOURCE = message.c po-error.c po-xerror.c \
-read-po-abstract.c po-lex.c po-gram-gen.y po-charset.c \
-read-properties.c read-stringtable.c open-po.c dir-list.c str-list.c
+read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \
+read-properties.c read-stringtable.c open-catalog.c dir-list.c str-list.c
 
 # xgettext and msgfmt deal with format strings.
 if !WOE32DLL
@@ -123,7 +123,7 @@ format-php.c format-gcc-internal.c format-qt.c format-boost.c
 
 # libgettextsrc contains all code that is needed by at least two programs.
 libgettextsrc_la_SOURCES = \
-$(COMMON_SOURCE) read-po.c \
+$(COMMON_SOURCE) read-catalog.c \
 write-catalog.c write-properties.c write-stringtable.c write-po.c \
 msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-english.c msgl-check.c \
 file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c plural-table.c \