From 45086082a06454cd1a2d1b91390a04a726b3ac28 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 13 May 1996 20:18:37 +0000
Subject: * 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).
---
 time/Makefile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'time')

diff --git a/time/Makefile b/time/Makefile
index 8feb377..bb8bd20 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -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
-- 
cgit v1.1