diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Nov 27 17:31:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (prelude.c): no longer depends on miniruby, since not + depending on rbconfig.rb. + Thu Nov 27 17:12:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (miniprelude.c): miniruby needs no preludes. @@ -460,7 +460,7 @@ clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-ex clean-local:: clean-runnable $(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time - $(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) + $(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb clean-runnable:: PHONY $(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0 @@ -483,7 +483,6 @@ distclean-local:: clean-local $(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP) distclean-ext:: PHONY distclean-golf: clean-golf - $(Q)$(RM) $(GOLFPRELUDES) distclean-rdoc: PHONY distclean-capi: PHONY distclean-extout: clean-extout @@ -491,9 +490,10 @@ distclean-platform: clean-platform realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout realclean-local:: distclean-local - $(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h + $(Q)$(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h realclean-ext:: PHONY realclean-golf: distclean-golf + $(Q)$(RM) $(GOLFPRELUDES) realclean-capi: PHONY realclean-extout: distclean-extout @@ -777,14 +777,14 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}prelude.rb $(PRELUDE_C): $(COMPILE_PRELUDE) \ {$(srcdir)}lib/rubygems/defaults.rb \ {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \ - $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS) + $(PRELUDE_SCRIPTS) $(LIB_SRCS) $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ + $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS) -{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb $(PREP) +{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ + $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl golf_prelude.rb probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb @@ -792,7 +792,7 @@ probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb probes.h: {$(VPATH)}probes.$(DTRACE_EXT) -prereq: incs srcs {$(VPATH)}miniprelude.c PHONY +prereq: incs srcs preludes PHONY preludes: {$(VPATH)}prelude.c preludes: {$(VPATH)}miniprelude.c |