Skip to content

Commit 504b963

Browse files
committed
Fix dependencies of generated prism sources for NMake
The VPATH rule of NMake is different from others. Abandon using them in the rules for the generated source, locate them in the top source directory, as well as the generated library files of prism.
1 parent 7c28fb2 commit 504b963

File tree

3 files changed

+126
-127
lines changed

3 files changed

+126
-127
lines changed

common.mk

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

253-
srcs: prism/api_node.c
254-
prism/api_node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/ext/prism/api_node.c.erb
253+
srcs: $(top_srcdir)/prism/api_node.c
254+
$(top_srcdir)/prism/api_node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/ext/prism/api_node.c.erb
255255
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb ext/prism/api_node.c $@
256256

257-
srcs: prism/ast.h
258-
prism/ast.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/ast.h.erb
257+
srcs: $(top_srcdir)/prism/ast.h
258+
$(top_srcdir)/prism/ast.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/ast.h.erb
259259
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/ast.h $@
260260

261-
srcs: prism/diagnostic.c
262-
prism/diagnostic.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/diagnostic.c.erb
261+
srcs: $(top_srcdir)/prism/diagnostic.c
262+
$(top_srcdir)/prism/diagnostic.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/diagnostic.c.erb
263263
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/diagnostic.c $@
264264

265-
srcs: prism/diagnostic.h
266-
prism/diagnostic.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/diagnostic.h.erb
265+
srcs: $(top_srcdir)/prism/diagnostic.h
266+
$(top_srcdir)/prism/diagnostic.h: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/include/prism/diagnostic.h.erb
267267
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb include/prism/diagnostic.h $@
268268

269-
srcs: prism/node.c
270-
prism/node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/node.c.erb
269+
srcs: $(top_srcdir)/prism/node.c
270+
$(top_srcdir)/prism/node.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/node.c.erb
271271
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/node.c $@
272272

273-
srcs: prism/prettyprint.c
274-
prism/prettyprint.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/prettyprint.c.erb
273+
srcs: $(top_srcdir)/prism/prettyprint.c
274+
$(top_srcdir)/prism/prettyprint.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/prettyprint.c.erb
275275
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/prettyprint.c $@
276276

277-
srcs: prism/serialize.c
278-
prism/serialize.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/serialize.c.erb
277+
srcs: $(top_srcdir)/prism/serialize.c
278+
$(top_srcdir)/prism/serialize.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/serialize.c.erb
279279
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/serialize.c $@
280280

281-
srcs: prism/token_type.c
282-
prism/token_type.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/token_type.c.erb
281+
srcs: $(top_srcdir)/prism/token_type.c
282+
$(top_srcdir)/prism/token_type.c: $(PRISM_SRCDIR)/config.yml $(PRISM_SRCDIR)/templates/template.rb $(PRISM_SRCDIR)/templates/src/token_type.c.erb
283283
$(Q) $(BASERUBY) $(PRISM_SRCDIR)/templates/template.rb src/token_type.c $@
284284

285285
EXPORTOBJS = $(DLNOBJ) \
@@ -1290,7 +1290,7 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
12901290
{$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
12911291
$(REVISION_H) \
12921292
$(UNICODE_DATA_HEADERS) $(ENC_HEADERS) \
1293-
$(srcs_vpath)prism/ast.h $(srcs_vpath)prism/diagnostic.h \
1293+
$(top_srcdir)/prism/ast.h $(top_srcdir)/prism/diagnostic.h \
12941294
{$(VPATH)}id.h {$(VPATH)}probes.dmyh
12951295

12961296
insns: $(INSNS)

0 commit comments

Comments
 (0)