From e071ec6d96541a833d89dccb1e24ec99cf5fa390 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 3 Apr 2008 03:56:07 +0000 Subject: * Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub (MINIOBJS, ARCHMINIOBJS): separated. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 6d0e1caa7..fdffa04a6 100644 --- a/common.mk +++ b/common.mk @@ -18,6 +18,7 @@ NORMALMAINOBJ = main.$(OBJEXT) MAINOBJ = $(NORMALMAINOBJ) EXTOBJS = DLDOBJS = $(DMYEXT) +MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT) COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ @@ -106,7 +107,7 @@ BOOTSTRAPRUBY = $(BASERUBY) VCS = svn -all: $(MKFILES) $(PREP) encdb transdb $(RBCONFIG) $(LIBRUBY) encs +all: $(MKFILES) $(PREP) incs $(RBCONFIG) $(LIBRUBY) encs @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) prog: $(PROGRAM) $(WPROGRAM) @@ -314,7 +315,7 @@ clean: clean-ext clean-local clean-enc clean-local:: @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time - @$(RM) *.inc $(GOLFOBJS) y.tab.c y.output + @$(RM) *.inc $(GOLFOBJS) y.tab.c y.output encdb.h transdb.h clean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean clean-enc: @@ -718,6 +719,8 @@ srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h +insns: $(INSNS) + node_name.inc: {$(VPATH)}node.h $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ -- cgit