1ef32c3dc4
1997-01-21 Paul Eggert <eggert@twinsun.com> * posix/getopt.c (_getopt_internal): Return -1, not EOF, when args are exhausted; this is required by POSIX.2. * catgets/gencat.c, db/makedb.c, locale/programs/locale.c, locale/programs/localedef.c, manual/examples/subopt.c, posix/getopt.c, posix/getopt1.c, stdio-common/bug4.c, sunrpc/rpcinfo.c (main): Check getopt return value against -1, not EOF. Tue Jan 21 23:10:40 1997 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 1.102. * sysdeps/unix/sysv/linux/alpha/Dist: Add kernel_sigaction.h. * elf/Makefile: Don't use CFLAGS-dl-load.c, but instead CPPFLAGS-dl-load.c so that dependencies can be determined correctly. * elf/dl-load.c: Fix comment. * time/Banner: New file. * time/Makefile (distribute): Add Banner. Update from ADO tzcode1997a and tzdata1997a. * time/antarctica: Update. * time/australia: Update. * time/zdump.c: Update. * time/zic.c: Update. * time/zone.tab: Update. Mon Jan 20 08:38:32 1997 H.J. Lu <hjl@gnu.ai.mit.edu> * config.make.in (has-ldconfig): New variable. * configure, configure.in (has_ldconfig): New substitute. * sysdeps/unix/sysv/linux/configure.in (has_ldconfig): New, check if $srcdir/elf/ldconfig.c exists. * Makeconfig (rootsbindir): New, default as $(exec_prefix)/sbin. (rtld-version-installed-name): New, default as ld-$(version).so. * Makefile (install): Call `$(common-objpfx)elf/ldconfig -d' only if $(cross-compiling) is no and $(build-shared) is yes. * Makerules (make-shlib-link): New macro. ($(slibdir)/libfoo.so.$(libfoo.so-version)): Use $(make-shlib-link) for symlink. (install-rootsbin, install-rootsbin-nosubdir): New. (install-no-libc.a-nosubdir): Add install-rootsbin-nosubdir. * Rules (others): Add $(install-rootsbin). * config.make.in (rootsbindir): New. * configure, configure.in (libc_cv_rootsbindir): New substitute. * elf/Makefile (others, install-rootsbin): New, set to ldconfig. (+link): New for static linking. ($(slibdir)/$(rtld-version-installed-name)): New. ($(slibdir)/$(rtld-installed-name)): Depend on $(slibdir)/$(rtld-version-installed-name) and use $(make-shlib-link) for symlink. * sunrpc/xdr.c (xdr_string): Return FALSE if sp == NULL while XDR_ENCODE. * sysdeps/unix/sysv/linux/a.out.h: Use #include_next for glibc internals. * sysdeps/unix/sysv/linux/configure.in (libc_cv_rootsbindir): New, set to "/sbin" if "$prefix" == "/usr". Tue Jan 21 13:38:39 1997 Ulrich Drepper <drepper@cygnus.com> * Makefile (distribute): Add glibcbug.in. Reported by Philip Blundell <pjb27@cam.ac.uk>. * elf/Makefile ($(objpfx)trusted-dirs.h): Create elf/ subdir in build directory if necessary. Reported by marcus@shannon.sysc.pdx.edu (Marcus G. Daniels).
183 lines
6.1 KiB
Makefile
183 lines
6.1 KiB
Makefile
# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# 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.
|
|
|
|
# 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.
|
|
|
|
# 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.
|
|
|
|
#
|
|
# Makefile for time routines
|
|
#
|
|
subdir := time
|
|
|
|
headers := time.h sys/time.h sys/timeb.h timebits.h
|
|
distribute := tzfile.h private.h scheck.c ialloc.c yearistype \
|
|
iso3166.tab zone.tab tzselect.ksh checktab.awk \
|
|
Banner
|
|
extra-objs = scheck.o ialloc.o $(tzfiles:%=z.%)
|
|
|
|
routines := offtime asctime clock ctime ctime_r difftime \
|
|
gmtime localtime mktime strftime time tzset \
|
|
tzfile gettimeofday settimeofday adjtime \
|
|
getitimer setitimer \
|
|
stime dysize timegm ftime \
|
|
strptime
|
|
|
|
others := ap zdump zic
|
|
tests := test_time clocktest test-tz
|
|
|
|
# Before the test-tz test can be run we need the data to be installed.
|
|
tests: install-test-data
|
|
|
|
|
|
tzfiles := africa antarctica asia australasia europe northamerica \
|
|
southamerica etcetera factory systemv backward \
|
|
solar87 solar88 solar89
|
|
# pacificnew doesn't compile; if it is to be used, it should be included in
|
|
# northamerica.
|
|
distribute += $(tzfiles) leapseconds pacificnew simplebackw
|
|
|
|
install-sbin := zic zdump
|
|
|
|
generated-dirs = testdata
|
|
|
|
all: # Make this the default target; it will be defined in Rules.
|
|
|
|
include ../Makeconfig # Get objpfx defined so we can use it below.
|
|
|
|
# z.* use this variable.
|
|
define nl
|
|
|
|
|
|
endef
|
|
-include $(addprefix $(objpfx)z.,$(tzfiles))
|
|
|
|
# Make these absolute file names.
|
|
installed-localtime-file := $(firstword $(filter /%,$(localtime-file)) \
|
|
$(addprefix $(zonedir)/, \
|
|
$(localtime-file)))
|
|
installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
|
|
$(addprefix $(zonedir)/, \
|
|
$(posixrules-file)))
|
|
|
|
ifeq ($(cross-compiling),no)
|
|
# Don't try to install the zoneinfo files since we can't run zic.
|
|
install-others = $(addprefix $(zonedir)/,$(zonenames) \
|
|
$(zonenames:%=posix/%) \
|
|
$(zonenames:%=right/%)) \
|
|
$(installed-localtime-file) $(installed-posixrules-file)
|
|
endif
|
|
|
|
ifeq ($(have-ksh),yes)
|
|
install-others += $(zonedir)/iso3166.tab $(zonedir)/zone.tab
|
|
install-bin += tzselect
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
|
|
$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
|
|
# Kludge alert: we use an implicit rule (in what we are generating here)
|
|
# because that is the only way to tell Make that the one command builds all
|
|
# the files.
|
|
(echo 'define $*-zones' ;\
|
|
awk '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^;\
|
|
echo 'endef' ;\
|
|
echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\
|
|
echo 'ifdef $*-zones' ;\
|
|
echo '$$(addprefix $$(datadir)/zone%/right/,$$($*-zones)): \' ;\
|
|
echo '$< $$(objpfx)zic leapseconds yearistype' ;\
|
|
echo ' $$(tzcompile)' ;\
|
|
echo '$$(addprefix $$(datadir)/zone%/posix/,$$($*-zones)): \' ;\
|
|
echo '$< $$(objpfx)zic /dev/null yearistype' ;\
|
|
echo ' $$(tzcompile)' ;\
|
|
echo '$$(addprefix $$(datadir)/zone%/,$$($*-zones)): \' ;\
|
|
echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\
|
|
echo ' $$(tzcompile)' ;\
|
|
echo 'endif' ;\
|
|
echo 'zonenames := $$(zonenames) $$($*-zones)' ;\
|
|
) > $@.new
|
|
mv $@.new $@
|
|
|
|
.PHONY: echo-zonenames
|
|
echo-zonenames:
|
|
@echo 'Known zones: $(zonenames)'
|
|
|
|
|
|
# Although $(zonedir) gets compiled into zic, it is useful to always
|
|
# specify it with -d on the command line so that it can be overridden on
|
|
# the command line of `make install' (e.g., "make install prefix=/foo").
|
|
zic-cmd = $(built-program-cmd) -d $(zonedir)
|
|
tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
|
|
-y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
|
|
|
|
# The source files specify the zone names relative to the -d directory,
|
|
# so for the posix/ and right/ flavors we need to pass -d $(zonedir)/posix
|
|
# and the like. This magic extracts /posix or /right if it's the first
|
|
# component after $(zonedir) in the target name $@.
|
|
target-zone-flavor = $(filter /posix /right, \
|
|
/$(firstword $(subst /, , \
|
|
$(patsubst $(zonedir)/%,%,$@))))
|
|
|
|
ifdef localtime
|
|
$(installed-localtime-file): $(zonedir)/$(localtime) $(objpfx)zic
|
|
$(make-target-directory)
|
|
if test -r $@; then \
|
|
echo Site timezone NOT reset to Factory.; \
|
|
else \
|
|
rm -f $@T; \
|
|
$(SHELL) $(..)/rellns-sh $< $@T; \
|
|
mv -f $@T $@; \
|
|
fi
|
|
endif
|
|
ifdef posixrules
|
|
$(installed-posixrules-file): $(zonedir)/$(posixrules) $(objpfx)zic
|
|
$(zic-cmd) -p $(posixrules)
|
|
endif
|
|
|
|
|
|
$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
|
|
|
|
tz-cflags = -DTZDIR='"$(zonedir)"' \
|
|
-DTZDEFAULT='"$(localtime-file)"' \
|
|
-DTZDEFRULES='"$(posixrules-file)"'
|
|
|
|
CFLAGS-zdump.c = -Wno-strict-prototypes -DNOID
|
|
CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags)
|
|
CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID
|
|
CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
|
|
CFLAGS-tzfile.c = $(tz-cflags)
|
|
|
|
# We have to make sure the data for testing the tz functions is available.
|
|
.PHONY: install-test-data
|
|
install-test-data: northamerica $(objpfx)zic $(leapseconds) yearistype \
|
|
etcetera simplebackw
|
|
-mkdir $(objpfx)testdata
|
|
$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
|
|
-y yearistype northamerica
|
|
$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
|
|
-y yearistype etcetera
|
|
$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
|
|
-y yearistype simplebackw
|
|
test-tz-ENV = TZDIR=$(objpfx)testdata
|
|
|
|
|
|
$(objpfx)tzselect: tzselect.ksh
|
|
sed -e 's%@KSH@%$(KSH)%g' \
|
|
-e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
|
|
chmod 555 $@.new
|
|
mv -f $@.new $@
|
|
|
|
$(addprefix $(zonedir)/,iso3166.tab zone.tab): $(zonedir)/%: %; $(do-install)
|