diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | ext/extmk.rb | 1 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Jan 29 16:25:26 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * common.mk, ext/extmkf.rb: always make encdb.h. + Tue Jan 29 12:53:39 2008 NARUSE, Yui <naruse@ruby-lang.org> * enc/gbk.c: add GBK, CP936 and CP949. @@ -700,14 +700,18 @@ vm.inc: $(srcdir)/template/vm.inc.tmpl srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c -incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h $(srcdir)/revision.h +incs: $(INSNS) {$(VPATH)}node_name.inc $(srcdir)/revision.h node_name.inc: {$(VPATH)}node.h $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ -encdb.h: $(srcdir)/enc/make_encdb.rb +encdb.h.new:: $(BASERUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@ +encdb.h: encdb.h.new + $(IFCHANGE) "$@" "$@.new" + -@$(RM) "$@.new" + miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ @@ -798,7 +802,7 @@ up: @$(VCS) up "$(srcdir)" -@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h" -help: +help: PHONY @echo " Makefile of Ruby" @echo "" @echo "targets:" diff --git a/ext/extmk.rb b/ext/extmk.rb index 8eca69f2ff..a91e3e1104 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -550,6 +550,7 @@ if $nmake == ?b end end $mflags.unshift("topdir=#$topdir") +ENV["RUBYOPT"] = '' system($make, *sysquote($mflags)) or exit($?.exitstatus) #Local variables: |