diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Dec 1 17:20:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (verconf.h): so depends on verconf.mk, which + is rebuilt by setup.mak. + Mon Dec 1 11:05:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * proc.c: fix grammar by @BenMorganIO [fix GH-764][ci skip] diff --git a/Makefile.in b/Makefile.in index 328131d14d..02274e4633 100644 --- a/Makefile.in +++ b/Makefile.in @@ -488,6 +488,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \ $(ECHO) generating $@ $(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ +verconf.h: $(RBCONFIG) + loadpath: verconf.h @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \ @@ -677,9 +677,9 @@ $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen. $(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans newline.$(OBJEXT): $(NEWLINE_C) -verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(RBCONFIG) +verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(ECHO) creating $@ - $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -c -o $@ $(srcdir)/template/verconf.h.tmpl + $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \ eval.$(OBJEXT) \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 11a5cf6217..668f9e151d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1166,6 +1166,8 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ ! endif !endif +verconf.h: verconf.mk + loadpath: verconf.h @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \ |