Rename gettext.h to gmo.h.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 3c4a4de25e2533402ca2b3db3e635e4ad80cc59b..d74ce519aa872af1858ff1232b7b1840591a71d1 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * gmo.h: Renamed from gettext.h.
+       * gettext.h: Remove file.
+       * gettextP.h: Update accordingly.
+       * loadmsgcat.c: Likewise.
+       * Makefile.in (COMHDRS): Add gmo.h, remove gettext.h.
+       (DISTFILES.obsolete): Add gettext.h.
+       Update dependencies.
+
 2001-12-18  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 2:0:0.

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 648d3b8d365dcfaf942ed95165aac00f0693bff1..73abfac266f8e0d76612ce15a25267ca9940ff8d 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -60,7 +60,7 @@ LDFLAGS = @LDFLAGS@
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h plural-exp.h plural-eval.c
+COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h plural-eval.c
 SOURCES = $(COMSRCS) intl-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
@@ -77,7 +77,7 @@ DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
 DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2
+COPYING.LIB-2 gettext.h
 
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
@@ -276,7 +276,7 @@ uninstall:
 info dvi:
 
 $(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gettext.h loadinfo.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
 dcigettext.$lo: hash-string.h
 explodename.$lo l10nflist.$lo: loadinfo.h
 dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h

diff --git a/intl/gettextP.h b/intl/gettextP.h
index 3efb53474e099bf0211b5975e69c8ea0ddcccb11..a642fdb6dea218d5ab731143b434ac45d3c7feec 100644 (file)
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -32,7 +32,7 @@
 
 #include "loadinfo.h"
 
-#include "gettext.h"           /* Get nls_uint32.  */
+#include "gmo.h"               /* Get nls_uint32.  */
 
 /* @@ end of prolog @@ */
 

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 2ab05f273ccdfe4f53895b6b228fd38b2bafa798..20aebddee116e9e568758575af9e4f39c0d1ba47 100644 (file)
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -71,7 +71,7 @@ char *alloca ();
 # undef HAVE_MMAP
 #endif
 
-#include "gettext.h"
+#include "gmo.h"
 #include "gettextP.h"
 #include "plural-exp.h"
 

diff --git a/src/read-mo.c b/src/read-mo.c
index deb739b2a0952291e73a8eaa39486da5f3f895bf..3d81e3b866d74f344511de47300b190c012badbf 100644 (file)
--- a/src/read-mo.c
+++ b/src/read-mo.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 /* This include file describes the main part of binary .mo format.  */
-#include "gettext.h"
+#include "gmo.h"
 
 #include "error.h"
 #include "xmalloc.h"

diff --git a/src/write-mo.c b/src/write-mo.c
index 2cdcd9f3f932cde12b7e372b5b203835ffe0f4d3..795c3d9fc6a2a4331426ab2c991c47a0a93fb40e 100644 (file)
--- a/src/write-mo.c
+++ b/src/write-mo.c
@@ -38,7 +38,7 @@
 #include "msgfmt.h"
 
 /* These two include files describe the binary .mo format.  */
-#include "gettext.h"
+#include "gmo.h"
 #include "hash-string.h"
 
 #include "error.h"