diff options
| author | Roland McGrath <roland@gnu.org> | 2005-04-15 20:09:13 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-04-15 20:09:13 +0000 |
| commit | 21cee297ec9dc2d6b5c5732b42d722dcbfe55838 (patch) | |
| tree | 1f632234ffbaab241c9fa0d353bfe0bd648c8aa4 | |
| parent | c9e169479eac36b4dfd20643c2b33ac13a06a41a (diff) | |
| download | glibc-21cee297ec9dc2d6b5c5732b42d722dcbfe55838.tar.gz glibc-21cee297ec9dc2d6b5c5732b42d722dcbfe55838.tar.xz glibc-21cee297ec9dc2d6b5c5732b42d722dcbfe55838.zip | |
* timezone/Makefile (zic-deps): New variable.
($(testdata)/America/New_York): Use it instead of explicit deps. ($(testdata)/Etc/UTC, $(testdata)/Australia/Melbourne): Likewise. ($(testdata)/America/Sao_Paulo, $(testdata)/Asia/Tokyo): Likewise. (%/UTC %/Universal): New pattern rule, replaces ... ($(testdata)/UTC, $(testdata)/Universal): ... these removed targets. ($(testdata)/%/Berlin $(testdata)/%/London): New pattern rule. ($(testdata)/Europe/London, $(testdata)/Europe/Berlin): Removed.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | timezone/Makefile | 30 |
2 files changed, 24 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 0046323c49..44d6e9fb67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-04-15 Roland McGrath <roland@redhat.com> + + * timezone/Makefile (zic-deps): New variable. + ($(testdata)/America/New_York): Use it instead of explicit deps. + ($(testdata)/Etc/UTC, $(testdata)/Australia/Melbourne): Likewise. + ($(testdata)/America/Sao_Paulo, $(testdata)/Asia/Tokyo): Likewise. + (%/UTC %/Universal): New pattern rule, replaces ... + ($(testdata)/UTC, $(testdata)/Universal): ... these removed targets. + ($(testdata)/%/Berlin $(testdata)/%/London): New pattern rule. + ($(testdata)/Europe/London, $(testdata)/Europe/Berlin): Removed. + 2005-04-14 Roland McGrath <roland@redhat.com> * MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well. diff --git a/timezone/Makefile b/timezone/Makefile index cf2c7d7f42..9947d45b17 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +# Copyright (C) 1998,1999,2000,2002,2005 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,28 +190,24 @@ $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ 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 +# 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) $(build-testdata) -$(testdata)/Europe/Berlin: europe $(objpfx)zic $(leapseconds) yearistype +$(testdata)/Etc/UTC: etcetera $(zic-deps) $(build-testdata) -$(testdata)/Universal: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \ - $(leapseconds) yearistype +# 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 $(build-testdata) -$(testdata)/Australia/Melbourne: australasia $(objpfx)zic $(leapseconds) \ - yearistype +$(testdata)/%/Berlin $(testdata)/%/London: europe $(zic-deps) $(build-testdata) -$(testdata)/America/Sao_Paulo: southamerica $(objpfx)zic $(leapseconds) \ - yearistype +$(testdata)/Australia/Melbourne: australasia $(zic-deps) $(build-testdata) -$(testdata)/Asia/Tokyo: asia $(objpfx)zic $(leapseconds) yearistype +$(testdata)/America/Sao_Paulo: southamerica $(zic-deps) $(build-testdata) -$(testdata)/Europe/London: europe $(objpfx)zic $(leapseconds) yearistype +$(testdata)/Asia/Tokyo: asia $(zic-deps) $(build-testdata) |