diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-27 10:12:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-27 10:12:46 +0000 |
| commit | 0d3d7c3a1ce7dc4007b5e1b6cd803db137bd04b9 (patch) | |
| tree | 897fe86c0c774a55ad72badea006315da9839c0c | |
| parent | f15c0dd7dd28bfcd53a3c68dc4c726595d207d3f (diff) | |
* Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
rid of depending PREP with nmake.
* common.mk (encs): depends on libruby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | win32/Makefile.sub | 8 |
4 files changed, 23 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Tue May 27 19:12:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@iDaemons.org> * ext/stringio/stringio.c (strio_each_char, Init_stringio): Add diff --git a/Makefile.in b/Makefile.in index 038f324447..5f910aa4fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ RANLIB = @RANLIB@ 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 @@ distclean-local:: ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + +MKPREP = $(PREP) @@ -111,7 +111,7 @@ BOOTSTRAPRUBY = $(BASERUBY) 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 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -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 @@ transdb.h: $(PREP) 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" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0112921800..c1821bb0f2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -752,3 +752,11 @@ dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h 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 |