From 298f256698b74e76273f51284d213103cbe65987 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 18 May 1998 11:43:16 +0000 Subject: Update. 1998-05-18 11:38 Ulrich Drepper * iconvdata/run-iconv-test.sh: Extend library-path by iconvdata directory. 1998-05-16 Andreas Jaeger * rpm/Makefile: Delete inclusion of version.mk. 1998-05-17 Andreas Jaeger * libc.map: Add all libio functions needed libstdc++ with version 2.0, sort entries. 1998-05-18 Andreas Jaeger * iconvdata/Makefile (generated): Add *.stmp files. 1998-05-17 Andreas Schwab * timezone/Makefile (testdata, build-testdata): New variables, use them in rules for test data. ($(objpfx)tst-timezone.out): Depend on test data. ($(testdata)/Europe/Berlin, $(testdata)/Universal, $(testdata)/Australia/Melbourne, $(testdata)/America/Sao_Paulo): New rules to build test data. (tst-timezone-ENV): Pass TZDIR to point to test data. --- timezone/Makefile | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) (limited to 'timezone') diff --git a/timezone/Makefile b/timezone/Makefile index 1b26d1ab4d..3f3f944e8b 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -166,22 +166,39 @@ CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID # We have to make sure the data for testing the tz functions is available. -$(objpfx)test-tz.out: $(addprefix $(objpfx)testdata/, America/New_York \ - Etc/UTC UTC) - -$(objpfx)testdata/America/New_York: northamerica $(objpfx)zic \ - $(leapseconds) yearistype - $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ - -y yearistype northamerica -$(objpfx)testdata/Etc/UTC: etcetera $(objpfx)zic $(leapseconds) yearistype - $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ - -y yearistype etcetera -$(objpfx)testdata/UTC: simplebackw $(objpfx)zic $(objpfx)testdata/Etc/UTC \ - $(leapseconds) yearistype - $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ - -y yearistype simplebackw +testdata = $(objpfx)testdata +define build-testdata +$(built-program-cmd) -d $(testdata) -L $(leapseconds) -y ./yearistype $< +endef -test-tz-ENV = TZDIR=$(objpfx)testdata +$(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC) +$(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ + Europe/Berlin Universal \ + Australia/Melbourne \ + America/Sao_Paulo) + +test-tz-ENV = TZDIR=$(testdata) +tst-timezone-ENV = TZDIR=$(testdata) + +$(testdata)/America/New_York: northamerica $(objpfx)zic $(leapseconds) \ + yearistype + $(build-testdata) +$(testdata)/Etc/UTC: etcetera $(objpfx)zic $(leapseconds) yearistype + $(build-testdata) +$(testdata)/UTC: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \ + $(leapseconds) yearistype + $(build-testdata) +$(testdata)/Europe/Berlin: europe $(objpfx)zic $(leapseconds) yearistype + $(build-testdata) +$(testdata)/Universal: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \ + $(leapseconds) yearistype + $(build-testdata) +$(testdata)/Australia/Melbourne: australasia $(objpfx)zic $(leapseconds) \ + yearistype + $(build-testdata) +$(testdata)/America/Sao_Paulo: southamerica $(objpfx)zic $(leapseconds) \ + yearistype + $(build-testdata) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make -- cgit v1.2.3