mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
(MINIOBJS, ARCHMINIOBJS): separated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5c1926ac82
commit
b0c77fe85b
6 changed files with 14 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Apr 3 12:56:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
|
||||||
|
(MINIOBJS, ARCHMINIOBJS): separated.
|
||||||
|
|
||||||
Thu Apr 3 09:00:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Apr 3 09:00:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* compile.c (iseq_set_sequence, iseq_insns_unification,
|
* compile.c (iseq_set_sequence, iseq_insns_unification,
|
||||||
|
|
|
@ -51,7 +51,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
|
||||||
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
|
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
|
||||||
SOLIBS = @SOLIBS@
|
SOLIBS = @SOLIBS@
|
||||||
MAINLIBS = @MAINLIBS@
|
MAINLIBS = @MAINLIBS@
|
||||||
MINIOBJS = @MINIOBJS@ miniprelude.$(OBJEXT)
|
ARCHMINIOBJS = @MINIOBJS@
|
||||||
BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
|
BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
|
||||||
|
|
||||||
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
||||||
|
|
|
@ -201,7 +201,7 @@ ASMEXT = asm
|
||||||
INSTALLED_LIST= .installed.list
|
INSTALLED_LIST= .installed.list
|
||||||
|
|
||||||
WINMAINOBJ = winmain.$(OBJEXT)
|
WINMAINOBJ = winmain.$(OBJEXT)
|
||||||
MINIOBJS = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
|
ARCHMINIOBJS = dmydln.$(OBJEXT)
|
||||||
|
|
||||||
arch_hdrdir = $(EXTOUT)/include/$(arch)
|
arch_hdrdir = $(EXTOUT)/include/$(arch)
|
||||||
hdrdir = $(srcdir)/include
|
hdrdir = $(srcdir)/include
|
||||||
|
|
|
@ -18,6 +18,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
|
||||||
MAINOBJ = $(NORMALMAINOBJ)
|
MAINOBJ = $(NORMALMAINOBJ)
|
||||||
EXTOBJS =
|
EXTOBJS =
|
||||||
DLDOBJS = $(DMYEXT)
|
DLDOBJS = $(DMYEXT)
|
||||||
|
MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
|
||||||
|
|
||||||
COMMONOBJS = array.$(OBJEXT) \
|
COMMONOBJS = array.$(OBJEXT) \
|
||||||
bignum.$(OBJEXT) \
|
bignum.$(OBJEXT) \
|
||||||
|
@ -106,7 +107,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
|
||||||
|
|
||||||
VCS = svn
|
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)
|
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
|
||||||
prog: $(PROGRAM) $(WPROGRAM)
|
prog: $(PROGRAM) $(WPROGRAM)
|
||||||
|
|
||||||
|
@ -314,7 +315,7 @@ clean: clean-ext clean-local clean-enc
|
||||||
clean-local::
|
clean-local::
|
||||||
@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
|
@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
|
||||||
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
|
@$(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:
|
clean-ext:
|
||||||
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
|
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
|
||||||
clean-enc:
|
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
|
incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h
|
||||||
|
|
||||||
|
insns: $(INSNS)
|
||||||
|
|
||||||
node_name.inc: {$(VPATH)}node.h
|
node_name.inc: {$(VPATH)}node.h
|
||||||
$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
|
$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
|
||||||
|
|
||||||
|
|
|
@ -1719,7 +1719,7 @@ case "$target_os" in
|
||||||
*)
|
*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
MINIOBJS="$MINIDLNOBJ dmyencoding.o dmytranscode.o"
|
MINIOBJS="$MINIDLNOBJ"
|
||||||
|
|
||||||
case "$build_os" in
|
case "$build_os" in
|
||||||
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
|
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
|
||||||
|
|
|
@ -250,7 +250,7 @@ INSTALLED_LIST= .installed.list
|
||||||
!if !defined(WINMAINOBJ)
|
!if !defined(WINMAINOBJ)
|
||||||
WINMAINOBJ = winmain.$(OBJEXT)
|
WINMAINOBJ = winmain.$(OBJEXT)
|
||||||
!endif
|
!endif
|
||||||
MINIOBJS = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
|
ARCHMINIOBJS = dmydln.$(OBJEXT)
|
||||||
LIBOBJS = $(MISSING) $(LIBOBJS)
|
LIBOBJS = $(MISSING) $(LIBOBJS)
|
||||||
|
|
||||||
!ifndef COMMON_LIBS
|
!ifndef COMMON_LIBS
|
||||||
|
|
Loading…
Add table
Reference in a new issue