diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | intl/Makefile | 183 |
2 files changed, 164 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index dd731fce4b..380c31f950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Sun Nov 19 18:23:07 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> + + * Makeconfig (+includes): Add $($(stdio)-include). + (libio-include): New variable. + + * stdlib/strtod.c: Put weak_symbol after function defn. + * stdlib/strtol.c: Likewise. + + * configure.in (--enable-libio): If not present, set $stdio to + "default". Move stdio/libio check to end, so sysdeps fragments + can affect it. Reset $stdio to "stdio" if it's "default". + * sysdeps/unix/sysv/linux/configure: New file. + Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu> * libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c, diff --git a/intl/Makefile b/intl/Makefile index 6e588fc88a..7f245cf4db 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -1,44 +1,163 @@ -# Makefile for intl subdirectory: message handling code from GNU gettext. - +# Generated automatically from Makefile.in by configure. +# Makefile for directory with message catalog handling in GNU NLS Utilities. # Copyright (C) 1995 Free Software Foundation, Inc. -# This file is part of the GNU C Library. +# +# 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. -# 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. +PACKAGE = gettext +VERSION = 0.9.12 -# 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. +SHELL = /bin/sh -# 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., 675 Mass Ave, -# Cambridge, MA 02139, USA. +srcdir = . +top_srcdir = .. +prefix = /usr/local +exec_prefix = ${prefix} +transform = s,x,x, +libdir = $(prefix)/lib +includedir = $(prefix)/include +datadir = $(prefix)/lib +localedir = $(datadir)/locale +gnulocaledir = $(prefix)/share/locale +gettextsrcdir = $(prefix)/share/gettext +aliaspath = $(localedir):. subdir = intl -headers = libintl.h -routines = bindtextdom dcgettext dgettext gettext \ - finddomain loadmsgcat localealias textdomain -distribute = gettext.h gettextP.h hash-string.h -include ../Rules +INSTALL = /usr/local/gnubin/install -c +INSTALL_DATA = ${INSTALL} -m 644 + +AR = ar +CC = gcc +RANLIB = ranlib + +DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ +-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H +CFLAGS = -g + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +HEADERS = $(COMHDRS) libgettext.h +COMHDRS = gettext.h gettextP.h hash-string.h +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 +OBJECTS = $(CATOBJS) bindtextdom.o dcgettext.o dgettext.o gettext.o \ +finddomain.o loadmsgcat.o localealias.o textdomain.o +CATOBJS = cat-compat.o ../po/cat-id-tbl.o +GETTOBJS = intl-compat.o +DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ +xopen-msg.sed $(HEADERS) $(SOURCES) +DISTFILES = $(DISTFILES.common) VERSION +DISTFILES.gettext = $(DISTFILES.common) libintl.h.glibc + +.SUFFIXES: +.SUFFIXES: .c .o +.c.o: + $(COMPILE) $< + +INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib + +all: libintl.a + + +libintl.a: $(OBJECTS) + rm -f $@ + $(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 + +check install: all + +# This installation goal is only used in GNU gettext. Packages which +# only use the library should use install instead. +# +# We must not install the libintl.h/libintl.a files if we are on a system +# which has the gettext() function in its C library or in a separate +# library. A special case is where configure found a previously installed +# GNU gettext library. If you want to use the one which comes with this +# version of the package, you have to use `configure --with-gnu-gettext'. +install-src: install + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir) $(gettextsrcdir) + if test -f libintl.h; then \ + $(INSTALL_DATA) libintl.h $(includedir)/libintl.h; \ + $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ + fi + cd $(srcdir) && \ + for file in $(DISTFILES.common); do \ + $(INSTALL_DATA) $$file $(gettextsrcdir)/intl-$$file; \ + done + $(INSTALL_DATA) VERSION $(gettextsrcdir)/intl-VERSION + +uninstall: + for file in $(DISTFILES); do \ + rm -f $(gettextsrcdir)/intl-$$file; \ + done + +$(OBJECTS): ../config.h libgettext.h +bindtextdom.o finddomain.o loadmsgcat.o: gettextP.h gettext.h +dcgettext.o: gettextP.h gettext.h hash-string.h + +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) + +id: ID + +ID: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) + + +mostlyclean: + rm -f *.a *.o core core.* + +clean: mostlyclean + +distclean: clean + rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + -CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \ - -D'LOCALE_ALIAS_PATH="$(localedir):$(nlsdir)"' +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist: Makefile $(DISTFILES) + for file in $(DISTFILES); do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done -ifdef gettext-srcdir +# This dist goal is only used in GNU gettext. GNU gettext needs not contain +# the file `VERSION' but contains some other files which should not be +# distributed in other packages. +dist-gettext: Makefile $(DISTFILES.gettext) + for file in $(DISTFILES.gettext); do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done -%:: $(gettext-srcdir)/intl/%.glibc; $(copysrc) -%:: $(gettext-srcdir)/intl/%; $(copysrc) +dist-libc: + tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -define copysrc -cp -f $< $@.new -chmod a-w $@.new -mv -f $@.new $@ -test ! -d CVS || cvs commit -m'Updated from $<' $@ -endef +Makefile: Makefile.in ../config.status + cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status -endif +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: |