diff options
Diffstat (limited to 'timezone/Makefile')
| -rw-r--r-- | timezone/Makefile | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/timezone/Makefile b/timezone/Makefile index 9947d45b17..cf2c7d7f42 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2002,2005 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2002 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 @@ -190,24 +190,28 @@ $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ test-tz-ENV = TZDIR=$(testdata) tst-timezone-ENV = TZDIR=$(testdata) -# Note this must come second in the deps list for $(built-program-cmd) to work. -zic-deps = $(objpfx)zic $(leapseconds) yearistype - -$(testdata)/America/New_York: northamerica $(zic-deps) +$(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)/Etc/UTC: etcetera $(zic-deps) +$(testdata)/Europe/Berlin: europe $(objpfx)zic $(leapseconds) yearistype $(build-testdata) -# Use a pattern rule to indicate the command produces both targets at once. -# Two separate targets built separately can collide if in parallel. -%/UTC %/Universal: simplebackw $(zic-deps) %/Etc/UTC +$(testdata)/Universal: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \ + $(leapseconds) yearistype $(build-testdata) -$(testdata)/%/Berlin $(testdata)/%/London: europe $(zic-deps) +$(testdata)/Australia/Melbourne: australasia $(objpfx)zic $(leapseconds) \ + yearistype $(build-testdata) -$(testdata)/Australia/Melbourne: australasia $(zic-deps) +$(testdata)/America/Sao_Paulo: southamerica $(objpfx)zic $(leapseconds) \ + yearistype $(build-testdata) -$(testdata)/America/Sao_Paulo: southamerica $(zic-deps) +$(testdata)/Asia/Tokyo: asia $(objpfx)zic $(leapseconds) yearistype $(build-testdata) -$(testdata)/Asia/Tokyo: asia $(zic-deps) +$(testdata)/Europe/London: europe $(objpfx)zic $(leapseconds) yearistype $(build-testdata) |