Skip to content

Commit fdf60d7

Browse files
committed
Win32: Fix dependencies with VPATH on nmake
1 parent ed9fff6 commit fdf60d7

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

common.mk

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -244,36 +244,36 @@ srcs: $(srcdir)/lib/prism/visitor.rb
244244
$(srcdir)/lib/prism/visitor.rb: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/lib/prism/visitor.rb.erb
245245
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb lib/prism/visitor.rb $(srcdir)/lib/prism/visitor.rb
246246

247-
srcs: prism/api_node.c
248-
prism/api_node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/ext/prism/api_node.c.erb
247+
srcs: $(srcs_vpath)prism/api_node.c
248+
$(srcs_vpath)prism/api_node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/ext/prism/api_node.c.erb
249249
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb ext/prism/api_node.c $@
250250

251-
srcs: prism/ast.h
252-
prism/ast.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/ast.h.erb
251+
srcs: $(srcs_vpath)prism/ast.h
252+
$(srcs_vpath)prism/ast.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/ast.h.erb
253253
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/ast.h $@
254254

255-
srcs: prism/diagnostic.c
256-
prism/diagnostic.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/diagnostic.c.erb
255+
srcs: $(srcs_vpath)prism/diagnostic.c
256+
$(srcs_vpath)prism/diagnostic.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/diagnostic.c.erb
257257
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/diagnostic.c $@
258258

259-
srcs: prism/diagnostic.h
260-
prism/diagnostic.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/diagnostic.h.erb
259+
srcs: $(srcs_vpath)prism/diagnostic.h
260+
$(srcs_vpath)prism/diagnostic.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/diagnostic.h.erb
261261
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/diagnostic.h $@
262262

263-
srcs: prism/node.c
264-
prism/node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/node.c.erb
263+
srcs: $(srcs_vpath)prism/node.c
264+
$(srcs_vpath)prism/node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/node.c.erb
265265
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/node.c $@
266266

267-
srcs: prism/prettyprint.c
268-
prism/prettyprint.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/prettyprint.c.erb
267+
srcs: $(srcs_vpath)prism/prettyprint.c
268+
$(srcs_vpath)prism/prettyprint.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/prettyprint.c.erb
269269
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/prettyprint.c $@
270270

271-
srcs: prism/serialize.c
272-
prism/serialize.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/serialize.c.erb
271+
srcs: $(srcs_vpath)prism/serialize.c
272+
$(srcs_vpath)prism/serialize.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/serialize.c.erb
273273
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/serialize.c $@
274274

275-
srcs: prism/token_type.c
276-
prism/token_type.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/token_type.c.erb
275+
srcs: $(srcs_vpath)prism/token_type.c
276+
$(srcs_vpath)prism/token_type.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/token_type.c.erb
277277
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/token_type.c $@
278278

279279
EXPORTOBJS = $(DLNOBJ) \
@@ -1266,6 +1266,7 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
12661266
{$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
12671267
$(REVISION_H) \
12681268
$(UNICODE_DATA_HEADERS) $(ENC_HEADERS) \
1269+
$(srcs_vpath)prism/ast.h $(srcs_vpath)prism/diagnostic.h \
12691270
{$(VPATH)}id.h {$(VPATH)}probes.dmyh
12701271

12711272
insns: $(INSNS)

0 commit comments

Comments
 (0)