nobu	2008-08-06 03:15:52 +0900 (Wed, 06 Aug 2008)

  New Revision: 18374

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18374

  Log:
    * enc/depend: added rules for .c from .erb.c.

  Modified files:
    trunk/ChangeLog
    trunk/enc/Makefile.in
    trunk/enc/depend

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18373)
+++ ChangeLog	(revision 18374)
@@ -1,3 +1,7 @@
+Wed Aug  6 03:15:49 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/depend: added rules for .c from .erb.c.
+
 Tue Aug  5 20:46:20 2008  Tanaka Akira  <akr@f...>
 
 	* tool/build-transcode: new file.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 18373)
+++ enc/Makefile.in	(revision 18374)
@@ -42,9 +42,12 @@
 dldflags = @DLDFLAGS@
 archflag = @ARCH_FLAG@
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+BASERUBY = @BASERUBY@
 
 RM = @RM@
 
+.SUFFIXES: .erb.c
+
 all:
 
 clean:
Index: enc/depend
===================================================================
--- enc/depend	(revision 18373)
+++ enc/depend	(revision 18374)
@@ -3,7 +3,17 @@
 % encs.each {|e| e.chomp!(".c")}
 % alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
 % encs = encs.sort_by(&alphanumeric_order)
-% trans = Dir.open($srcdir+"/trans") {|d| d.select {|e| e.chomp!('.c') && /\.erb\z/ !~ e }}
+% atrans = []
+% trans = Dir.open($srcdir+"/trans") {|d|
+%   d.select {|e|
+%     if e.chomp!('.c')
+%       atrans << e if e.chomp!(".erb")
+%       true
+%     end
+%   }
+% }
+% trans.uniq!
+% atrans = atrans.sort_by(&alphanumeric_order)
 % trans = trans.sort_by(&alphanumeric_order)
 % trans.map! {|e| "trans/#{e}"}
 % dependencies = encs + trans
@@ -34,7 +44,14 @@
 %   unless trans.empty?
 $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
 %   end
+%   atrans.each do |e|
+%     src = "#{e}.erb.c"
+%     src = [src, *IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|e|e+".rb"}]
 
+$(srcdir)/enc/trans/<%=e%>.c: <%= src.map {|e| "$(srcdir)/enc/trans/#{e}"}.join(" ")%>
+	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+%   end
+
 % end
 % link_so = LINK_SO.gsub(/\n/, "\n\t")
 % link_so.gsub!(/(-(?:implib|pdb):\S+)-\$\(arch\)\./, '\1.')

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