summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-26 08:06:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-26 08:06:59 +0000
commit9ea58e64218d55d235cb732309f2665b2d31866f (patch)
tree2dd4a220b1bf6b600eb8afe3e50131cab7121f0f
parentf8718692a2ee7e62e2fa3678963c8d71809abb42 (diff)
* common.mk (ENC_MK): defaulted to enc.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk15
1 files changed, 8 insertions, 7 deletions
diff --git a/common.mk b/common.mk
index fb880c7af7..f6f9235d98 100644
--- a/common.mk
+++ b/common.mk
@@ -24,6 +24,7 @@ MAINOBJ = $(NORMALMAINOBJ)
EXTOBJS =
DLDOBJS = $(DMYEXT)
MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
+ENC_MK = enc.mk
COMMONOBJS = array.$(OBJEXT) \
bignum.$(OBJEXT) \
@@ -332,7 +333,7 @@ clean-local::
@$(RM) *.inc y.tab.c y.output encdb.h transdb.h
clean-ext::
clean-enc:
- @-$(MAKE) -f enc.mk $(MFLAGS) clean
+ @-$(MAKE) -f $(ENC_MK) $(MFLAGS) clean
clean-golf:
@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -343,7 +344,7 @@ distclean-local:: clean-local
@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
distclean-ext::
distclean-enc: clean-enc
- @-$(MAKE) -f enc.mk $(MFLAGS) distclean
+ @-$(MAKE) -f $(ENC_MK) $(MFLAGS) distclean
distclean-golf: clean-golf
@$(RM) $(GOLFPRELUDES)
@@ -382,10 +383,10 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
-encs: enc.mk $(LIBRUBY) $(PREP) transdb.h
- $(MAKE) -f enc.mk MINIRUBY="$(MINIRUBY)" $(MFLAGS)
+encs: $(ENC_MK) $(LIBRUBY) $(PREP) transdb.h
+ $(MAKE) -f $(ENC_MK) MINIRUBY="$(MINIRUBY)" $(MFLAGS)
-enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
+$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
$(srcdir)/lib/mkmf.rb $(RBCONFIG)
$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
@@ -625,8 +626,8 @@ vm.inc: $(srcdir)/template/vm.inc.tmpl
srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c $(srcdir)/ext/ripper/ripper.c srcs-enc
-srcs-enc: enc.mk
- $(MAKE) -f enc.mk RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+srcs-enc: $(ENC_MK)
+ $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h