* time/Makefile (zonenames): Target removed.

(extra-objs): Remove it from here.
	Include the z.* files directly instead of including zonenames; use
	`-include' to not complain befre they exist.

	* sysdeps/unix/Makefile: Find sysd-syscalls and s-proto.d with
	$(common-objpfx) instead of $(objpfx).
This commit is contained in:
Roland McGrath 1996-05-13 20:18:37 +00:00
parent d929664ab5
commit 45086082a0
5 changed files with 20 additions and 13 deletions

View File

@ -1,5 +1,13 @@
Mon May 13 12:03:03 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/Makefile (zonenames): Target removed.
(extra-objs): Remove it from here.
Include the z.* files directly instead of including zonenames; use
`-include' to not complain befre they exist.
* sysdeps/unix/Makefile: Find sysd-syscalls and s-proto.d with
$(common-objpfx) instead of $(objpfx).
* Makerules [install-lib-non.a]: Find these things with $(objpfx)
instead of $(common-objpfx).

2
configure vendored
View File

@ -17,7 +17,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-gettext=DIR find GNU gettext source code in DIR (not needed)"
ac_help="$ac_help
--with-fp if using floating-point hardware"
--with-fp if using floating-point hardware default=yes"
ac_help="$ac_help
--with-gnu-binutils if using GNU binutils (as and ld)"
ac_help="$ac_help

View File

@ -873,6 +873,10 @@ families of functions; reentrant @samp{@dots{}@code{_r}} versions of the
@code{random} family; System V shared memory and IPC support code; and
several highly-optimized string functions for i@var{x}86 processors.
@item
The math functions are taken from @code{fdlibm-5.1} by Sun
Microsystems, as modified by J.T. Conklin and Ian Lance Taylor.
@item
The Internet-related code (most of the @file{inet} subdirectory) and
several other miscellaneous functions and header files have been

View File

@ -272,7 +272,7 @@ ifndef inhibit-unix-syscalls
# Sysdep dirs unix/... can contain a file syscalls.list,
# which specifies objects to be compiled as simple Unix system calls.
-include $(objpfx)sysd-syscalls
-include $(common-objpfx)sysd-syscalls
omit-deps += $(unix-syscalls)
ifeq (misc,$(subdir))
@ -282,8 +282,8 @@ endif
export sysdirs
export asm_CPP := $(COMPILE.S) -E -x assembler-with-cpp
$(objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \
$(wildcard $(+sysdep_dirs:%=%/syscalls.list))
$(common-objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \
$(wildcard $(+sysdep_dirs:%=%/syscalls.list))
for dir in $$sysdirs; do \
test -f $(..)sysdeps/$$dir/syscalls.list && \
{ $(SHELL) $(dir $<)$(notdir $<) \
@ -298,7 +298,7 @@ ifdef subdir
ifndef no_deps
# These deps use file names relative to a subdir, so don't
# include them in the parent directory.
-include $(objpfx)s-proto.d
-include $(common-objpfx)s-proto.d
endif
endif

View File

@ -23,7 +23,7 @@ subdir := time
headers := time.h sys/time.h sys/timeb.h timebits.h
distribute := tzfile.h private.h scheck.c ialloc.c yearistype
extra-objs = scheck.o ialloc.o zonenames $(tzfiles:%=z.%)
extra-objs = scheck.o ialloc.o $(tzfiles:%=z.%)
routines := offtime asctime clock ctime difftime gmtime \
localtime mktime strftime time tzset tzfile \
@ -46,12 +46,12 @@ all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig # Get objpfx defined so we can use it below.
# zonenames uses this variable.
# z.* use this variable.
define nl
endef
include $(objpfx)zonenames
-include $(addprefix $(objpfx)z.,$(tzfiles))
# Make these absolute file names.
installed-localtime-file := $(firstword $(filter /%,$(localtime-file)) \
@ -86,11 +86,6 @@ $(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
echo 'zonenames := $$(zonenames) $$($*-zones)' ;\
) > $@.new
mv $@.new $@
$(objpfx)zonenames: Makefile
(for file in $(tzfiles); do \
echo "include \$$(objpfx)z.$$file"; \
done) > $@.new
mv $@.new $@
.PHONY: echo-zonenames
echo-zonenames: zonenames