aboutsummaryrefslogtreecommitdiff
path: root/timezone
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-18 11:43:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-18 11:43:16 +0000
commit298f256698b74e76273f51284d213103cbe65987 (patch)
treefc0c45923582d8bb82a6c739f7c0677b443d8ca4 /timezone
parent41aa20c243f5b9d51150586651e8b5437cfdb085 (diff)
downloadglibc-298f256698b74e76273f51284d213103cbe65987.zip
glibc-298f256698b74e76273f51284d213103cbe65987.tar.gz
glibc-298f256698b74e76273f51284d213103cbe65987.tar.bz2
Update.
1998-05-18 11:38 Ulrich Drepper <drepper@cygnus.com> * iconvdata/run-iconv-test.sh: Extend library-path by iconvdata directory. 1998-05-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * rpm/Makefile: Delete inclusion of version.mk. 1998-05-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Add all libio functions needed libstdc++ with version 2.0, sort entries. 1998-05-18 Andreas Jaeger <aj@arthur.rhein-neckar.de> * iconvdata/Makefile (generated): Add *.stmp files. 1998-05-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * 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.
Diffstat (limited to 'timezone')
-rw-r--r--timezone/Makefile47
1 files changed, 32 insertions, 15 deletions
diff --git a/timezone/Makefile b/timezone/Makefile
index 1b26d1a..3f3f944 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