diff options
| -rw-r--r-- | intl/ChangeLog | 17 | ||||
| -rw-r--r-- | intl/Makefile.in | 39 | ||||
| -rw-r--r-- | intl/VERSION | 2 | ||||
| -rw-r--r-- | intl/bindtextdom.c | 24 | ||||
| -rw-r--r-- | intl/finddomain.c | 24 | ||||
| -rw-r--r-- | intl/gettextP.h | 32 | ||||
| -rw-r--r-- | intl/l10nflist.c | 31 | ||||
| -rw-r--r-- | intl/localealias.c | 25 | ||||
| -rw-r--r-- | intl/textdomain.c | 5 |
9 files changed, 114 insertions, 85 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 748ec56..cfb34fa 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,20 @@ +Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> + + * Makefile.in: Implement handling of libtool. + + * gettextP.h: Change data structures for use of generic lowlevel + i18n file handling. + +Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> + + * textdomain.c: Put parentheses around arguments of memcpy macro + definition. + * localealias.c: Likewise. + * l10nflist.c: Likewise. + * finddomain.c: Likewise. + * bindtextdom.c: Likewise. + Reported by Thomas Esken. + Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> * textdomain.c: Move definition of `memcpy` macro to right diff --git a/intl/Makefile.in b/intl/Makefile.in index 474f72d..72a697e 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = .. VPATH = @srcdir@ prefix = @prefix@ @@ -40,13 +41,17 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ +l = @l@ + AR = ar CC = @CC@ +LIBTOOL = @LIBTOOL@ RANLIB = @RANLIB@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ CFLAGS = @CFLAGS@ +LDFLAGS = @LDFLAGS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) @@ -56,26 +61,28 @@ SOURCES = $(COMSRCS) intl-compat.c cat-compat.c COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ explodename.c -OBJECTS = @INTLOBJS@ bindtextdom.o dcgettext.o dgettext.o gettext.o \ -finddomain.o loadmsgcat.o localealias.o textdomain.o l10nflist.o \ -explodename.o -CATOBJS = cat-compat.o ../po/cat-id-tbl.o -GETTOBJS = intl-compat.o +OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ +finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ +explodename.$lo +CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo +GETTOBJS = intl-compat.$lo DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ xopen-msg.sed $(HEADERS) $(SOURCES) DISTFILES.normal = VERSION DISTFILES.gettext = libintl.glibc intlh.inst.in .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .o .lo .c.o: $(COMPILE) $< +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) $< INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib all: all-@USE_INCLUDED_LIBINTL@ -all-yes: libintl.a intlh.inst +all-yes: libintl.$la intlh.inst all-no: libintl.a: $(OBJECTS) @@ -83,8 +90,12 @@ libintl.a: $(OBJECTS) $(AR) cru $@ $(OBJECTS) $(RANLIB) $@ -../po/cat-id-tbl.o: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot - cd ../po && $(MAKE) cat-id-tbl.o +libintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ + -version-info 1:0 -rpath $(libdir) + +../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot + cd ../po && $(MAKE) cat-id-tbl.$lo check: all @@ -132,7 +143,7 @@ install-data: all installcheck: uninstall: - dists="$(DISTFILES)"; \ + dists="$(DISTFILES.common)"; \ for file in $$dists; do \ rm -f $(gettextsrcdir)/$$file; \ done @@ -140,8 +151,8 @@ uninstall: info dvi: $(OBJECTS): ../config.h libgettext.h -bindtextdom.o finddomain.o loadmsgcat.o: gettextP.h gettext.h loadinfo.h -dcgettext.o: gettextP.h gettext.h hash-string.h loadinfo.h +bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h +dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h tags: TAGS @@ -155,7 +166,7 @@ ID: $(HEADERS) $(SOURCES) mostlyclean: - rm -f *.a *.o core core.* + rm -f *.a *.o *.lo core core.* clean: mostlyclean diff --git a/intl/VERSION b/intl/VERSION index 3b7d41e..7d069b8 100644 --- a/intl/VERSION +++ b/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.26 +GNU gettext library from gettext-0.10.27 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 6a3b3e1..72583f2 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -1,19 +1,19 @@ /* bindtextdom.c -- implementation of the bindtextdomain(3) function Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -34,7 +34,7 @@ void free (); #else # include <strings.h> # ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num)) # endif #endif diff --git a/intl/finddomain.c b/intl/finddomain.c index ba5c33e..3b7861e 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -2,19 +2,19 @@ Copyright (C) 1995, 1996 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -43,7 +43,7 @@ void free (); # define strchr index # endif # ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num)) # endif #endif diff --git a/intl/gettextP.h b/intl/gettextP.h index 74a76f5..bb8d552 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -1,19 +1,19 @@ -/* gettextP.h -- header describing internals of gettext library - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Header describing internals of gettext library + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _GETTEXTP_H #define _GETTEXTP_H diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 7db63db..3611b12 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -1,21 +1,20 @@ -/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. +/* finddomain.c -- handle list of needed message catalogs + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -32,7 +31,7 @@ Boston, MA 02111-1307, USA. */ # define strchr index # endif # ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num)) # endif #endif diff --git a/intl/localealias.c b/intl/localealias.c index e3eb5b8..a869acf 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -1,19 +1,20 @@ /* localealias.c -- handle aliases for locale names Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -62,7 +63,7 @@ void free (); # define strchr index # endif # ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num)) # endif #endif diff --git a/intl/textdomain.c b/intl/textdomain.c index d197181..09530b8 100644 --- a/intl/textdomain.c +++ b/intl/textdomain.c @@ -1,5 +1,6 @@ /* textdomain.c -- implementation of the textdomain(3) function Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,8 +28,8 @@ # include <string.h> #else # include <strings.h> -# if !defined (HAVE_MEMCPY) && defined (HAVE_BCOPY) && !defined (memcpy) -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) +# ifndef memcpy +# define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num)) # endif #endif |