Renamed plural-eval.c to eval-plural.h.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 0c733565a0b0fb1ee8fefb2047824596a59165b9..46c011bf74cd4accff50d041dc357b1da37f8206 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -2,6 +2,13 @@
 
        * gettext-0.11 released.
 
+2002-01-31  Bruno Haible  <bruno@clisp.org>
+
+       * eval-plural.h: Renamed from plural-eval.c.
+       * dcigettext.c: Include eval-plural.h instead of plural-eval.c.
+       * Makefile.in (COMHDRS): Remove plural-eval.c, add eval-plural.h.
+       (DISTFILES.obsolete): Add plural-eval.c.
+
 2002-01-24  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in (libintl.la): Use @LTLIBICONV@ instead of @LIBICONV@.

diff --git a/intl/Makefile.in b/intl/Makefile.in
index a00f92d4359d32c1cec05e3421ee56bfbab170eb..c2cb20f113833d04f2d93391aa5def1b2b1443d3 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 loadinfo.h
-COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h plural-eval.c os2compat.h
+COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
 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 gettext.h libgettext.h
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
 
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
@@ -280,7 +280,7 @@ bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngette
 dcigettext.$lo: hash-string.h
 explodename.$lo l10nflist.$lo: loadinfo.h
 dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
-dcigettext.$lo: plural-eval.c
+dcigettext.$lo: eval-plural.h
 
 tags: TAGS
 

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index de60d9fbf546be351754ecccd5a615bd77b6bb80..2e724e19e74be74e5631016b6bdcc655701900c2 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -382,7 +382,7 @@ static int enable_secure;
 #endif
 
 /* Get the function to evaluate the plural expression.  */
-#include "plural-eval.c"
+#include "eval-plural.h"
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    CATEGORY locale and, if PLURAL is nonzero, search over string

diff --git a/src/ChangeLog b/src/ChangeLog
index 88b0fc35ffd13fd6ccf35d1b5652e2a419e3a7f5..5fb4106ccf6d2978dab7fdbe4168dcc7f771c019 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,10 @@
 
        * gettext-0.11 released.
 
+2002-01-31  Bruno Haible  <bruno@clisp.org>
+
+       * plural-eval.h: Include eval-plural.h instead of plural-eval.c.
+
 2002-01-30  Bruno Haible  <bruno@clisp.org>
 
        Make the gettext and ngettext programs independent of libgettextlib.

diff --git a/src/plural-eval.c b/src/plural-eval.c
index 029cac9ecdf0c9f4b82f494af9bf1c416d893960..ddf2699bf476860bb55abd08cad8ca7c8a39a2c5 100644 (file)
--- a/src/plural-eval.c
+++ b/src/plural-eval.c
@@ -1,5 +1,5 @@
 /* Expression evaluation for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,4 +26,4 @@
 
 /* Include the expression evaluation code from libintl, this time with
    'extern' linkage.  */
-#include "../intl/plural-eval.c"
+#include "../intl/eval-plural.h"