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.
This commit is contained in:
Roland McGrath 1995-11-20 10:01:12 +00:00
parent 96aa2d94a2
commit 054cc4cc38
2 changed files with 165 additions and 33 deletions

View File

@ -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> 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, * libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,

View File

@ -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. # 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
# The GNU C Library is free software; you can redistribute it and/or # it under the terms of the GNU General Public License as published by
# modify it under the terms of the GNU Library General Public License # the Free Software Foundation; either version 2, or (at your option)
# as published by the Free Software Foundation; either version 2 of # any later version.
# the License, or (at your option) any later version. #
# This program is distributed in the hope that it will be useful,
# The GNU C Library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Library General Public License for more details. # 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 Library General Public PACKAGE = gettext
# License along with the GNU C Library; see the file COPYING.LIB. If VERSION = 0.9.12
# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
# Cambridge, MA 02139, USA.
SHELL = /bin/sh
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 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
CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \ AR = ar
-D'LOCALE_ALIAS_PATH="$(localedir):$(nlsdir)"' CC = gcc
RANLIB = ranlib
ifdef gettext-srcdir DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DHAVE_CONFIG_H
CFLAGS = -g
%:: $(gettext-srcdir)/intl/%.glibc; $(copysrc) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
%:: $(gettext-srcdir)/intl/%; $(copysrc)
define copysrc HEADERS = $(COMHDRS) libgettext.h
cp -f $< $@.new COMHDRS = gettext.h gettextP.h hash-string.h
chmod a-w $@.new SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
mv -f $@.new $@ COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
test ! -d CVS || cvs commit -m'Updated from $<' $@ finddomain.c loadmsgcat.c localealias.c textdomain.c
endef 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
endif .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."
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
# 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
dist-libc:
tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
Makefile: Makefile.in ../config.status
cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
# 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: