naruse	2008-01-29 16:27:09 +0900 (Tue, 29 Jan 2008)

  New Revision: 15310

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/ext/extmk.rb

  Log:
    * common.mk, ext/extmkf.rb: always make encdb.h.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15310&r2=15309&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=15310&r2=15309&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15310&r2=15309&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15309)
+++ ChangeLog	(revision 15310)
@@ -1,3 +1,7 @@
+Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@r...>
+
+	* common.mk, ext/extmkf.rb: always make encdb.h.
+
 Tue Jan 29 12:53:39 2008  NARUSE, Yui  <naruse@r...>
 
 	* enc/gbk.c: add GBK, CP936 and CP949.
Index: common.mk
===================================================================
--- common.mk	(revision 15309)
+++ common.mk	(revision 15310)
@@ -700,14 +700,18 @@
 
 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 @@
 	@$(VCS) up "$(srcdir)"
 	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
 
-help:
+help: PHONY
 	@echo "                Makefile of Ruby"
 	@echo ""
 	@echo "targets:"
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 15309)
+++ ext/extmk.rb	(revision 15310)
@@ -550,6 +550,7 @@
   end
 end
 $mflags.unshift("topdir=#$topdir")
+ENV["RUBYOPT"] = ''
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/