ruby-changes:5142
From: nobu <ko1@a...>
Date: Tue, 27 May 2008 19:13:03 +0900 (JST)
Subject: [ruby-changes:5142] Ruby:r16637 (trunk): * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
nobu 2008-05-27 19:12:46 +0900 (Tue, 27 May 2008) New Revision: 16637 Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Log: * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get rid of depending PREP with nmake. * common.mk (encs): depends on libruby. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=16637&r2=16636&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16637&r2=16636&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=16637&r2=16636&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16637&r2=16636&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 16636) +++ ChangeLog (revision 16637) @@ -1,3 +1,10 @@ +Tue May 27 19:12:37 2008 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get + rid of depending PREP with nmake. + + * common.mk (encs): depends on libruby. + Tue May 27 19:00:22 2008 Akinori MUSHA <knu@i...> * ext/stringio/stringio.c (strio_each_char, Init_stringio): Add Index: common.mk =================================================================== --- common.mk (revision 16636) +++ common.mk (revision 16637) @@ -111,7 +111,7 @@ VCS = svn -all: $(MKFILES) $(PREP) incs $(RBCONFIG) $(LIBRUBY) encs +all: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) encs @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) prog: $(PROGRAM) $(WPROGRAM) @@ -372,12 +372,12 @@ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb -encs: enc.mk +encs: enc.mk $(LIBRUBY) $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans $(MAKE) -f enc.mk $(MFLAGS) enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ - $(srcdir)/lib/mkmf.rb $(RBCONFIG) + $(srcdir)/lib/mkmf.rb $(MKPREP) $(RBCONFIG) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@ .PRECIOUS: $(MKFILES) @@ -742,12 +742,12 @@ miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ -prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(RBCONFIG) $(PREP) +prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(MKPREP) $(RBCONFIG) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \ $(PRELUDE_SCRIPTS) $@.new $(IFCHANGE) "$@" "$@.new" -golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) +golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(MKPREP) $(RBCONFIG) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@.new $(IFCHANGE) "$@" "$@.new" Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 16636) +++ win32/Makefile.sub (revision 16637) @@ -752,3 +752,11 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + +!if !exist(prelude.c) +prelude.c: $(PREP) +!endif + +!if !exist(golf_prelude.c) +golf_prelude.c: $(PREP) +!endif Index: Makefile.in =================================================================== --- Makefile.in (revision 16636) +++ Makefile.in (revision 16637) @@ -96,7 +96,7 @@ AS = @AS@ ASFLAGS = @ASFLAGS@ IFCHANGE = $(srcdir)/tool/ifchange -SET_LC_MESSAGES = LC_MESSAGES=C +SET_LC_MESSAGES = env LC_MESSAGES=C OBJEXT = @OBJEXT@ ASMEXT = S @@ -204,3 +204,5 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + +MKPREP = $(PREP) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/