Skip to content

Commit 550e84d

Browse files
committed
Improve handling of intermediate locale files.
1 parent 7392674 commit 550e84d

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ d3.dsv.js: \
201201

202202
d3.time.js: \
203203
src/time/time.js \
204-
src/time/format-locale.js \
205204
src/time/format-$(LOCALE).js \
206205
src/time/format.js \
207206
src/time/format-utc.js \
@@ -235,16 +234,18 @@ test: all
235234

236235
d3%.js: Makefile
237236
@rm -f $@
238-
cat $(filter %.js,$(filter-out src/time/format-locale.js,$^)) | $(JS_BEAUTIFIER) > $@
237+
cat $(filter %.js,$^) | $(JS_BEAUTIFIER) > $@
239238
@chmod a-w $@
240239

241240
package.json: src/package.js
242241
@rm -f $@
243242
node src/package.js > $@
244243
@chmod a-w $@
245244

246-
src/time/format-%.js:
245+
src/time/format-$(LOCALE).js: src/time/format-locale.js
247246
LC_TIME=$(LOCALE) locale -ck LC_TIME | node src/time/format-locale.js > $@
248247

248+
.INTERMEDIATE: src/time/format-$(LOCALE).js
249+
249250
clean:
250251
rm -f d3*.js package.json

src/time/format-en_US.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)