* common.mk (encs): added dependencies.

* enc/Makefile.in, enc/depend, enc/make_encmake.rb: moved serb code.

* lib/mkmf.rb (depend_rules): now takes content string, not file name.

* win32/enc-setup.mak: overrides default target.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 31 insertions, 30 deletions

diff --git a/enc/Makefile.in b/enc/Makefile.in
index 05296dc602..792fb9fc21 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -4,7 +4,6 @@ arch = @arch@
 EXTOUT = @EXTOUT@
 hdrdir = $(top_srcdir)/include
 arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join("@PATH_SEPARATOR@") %>
 ENCSODIR = $(EXTOUT)/$(arch)/enc
 DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
@@ -13,30 +12,15 @@ BUILTIN_ENCS	= ascii.c \
 		  euc_jp.c sjis.c \
 		  unicode.c utf8.c
 
-ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t  ")+"\n"%>
-ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")+"\n"%>
 empty =
 CC = @CC@
 OUTFLAG = @OUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @ARCH_FLAG@
-XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) @XCFLAGS@
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
+DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
 LIBS = @LIBS@ $(EXTLIBS)
 LDSHARED = @LDSHARED@
 DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
-
-#!#! if File.exist?(depend = File.join($srcdir, "depend"))
-#### depend ####
-#!#<%  depend_rules(depend).join%>
-#!#! end
-#!#! encs.each do |e|
-#!#
-#!#$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
-#!#	<%LINK_SO.gsub(/\n/, "\n\t")%>
-#!#! end
-#!#! encs.each do |e|
-#!#
-#!#<%e%>.$(OBJEXT): <% (RULE_SUBST || "%s") % "#{e}.c" %>
-#!#! end
diff --git a/enc/depend b/enc/depend
index 9a7cf1a1ff..8fc836daff 100644
--- a/enc/depend
+++ b/enc/depend
@@ -1,3 +1,24 @@
+! encs = (Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - CONFIG["BUILTIN_ENCS"].split).each {|e| e.chomp!(".c")}
+
+VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %>
+
+ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t  ")+"\n"%>
+
+ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")+"\n"%>
+
 all: $(ENCSOS)
 
+.c.$(OBJEXT):
+	<%COMPILE_C%>
+
 $(ENCOBJS): regenc.h oniguruma.h config.h defines.h
+
+! encs.each do |e|
+
+$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
+	<%LINK_SO.gsub(/\n/, "\n\t")%>
+! end
+
+! encs.each do |e|
+<%e%>.$(OBJEXT): <%e%>.c
+! end
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index fe75b2778d..593f8ba626 100644
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -3,21 +3,17 @@
 dir = File.expand_path("../..", __FILE__)
 $:.unshift(File.join(dir, "lib"))
 $:.unshift(dir)
-File.directory?("enc") || File.mkdir("enc")
 $:.unshift(".")
 require 'mkmf'
 require 'tool/serb'
 
-encdir = File.join($top_srcdir, "enc")
-
-encs = Dir.open(encdir) {|d| d.grep(/.+\.c\z/)}
-encs -= CONFIG["BUILTIN_ENCS"].split
-encs.each {|e| e.chomp!(".c")}
-mkin = File.read(File.join(encdir, "Makefile.in"))
-mkin.gsub!(/^\#!\# ?/, '')
-mkin.gsub!(/@(#{RbConfig::MAKEFILE_CONFIG.keys.join('|')})@/) {CONFIG[$1]}
-tmp = ''
-eval(serb(mkin, 'tmp'))
+mkin = File.read(File.join($srcdir, "Makefile.in"))
+mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
+if File.exist?(depend = File.join($srcdir, "depend"))
+  tmp = ''
+  eval(serb(File.read(depend), 'tmp'))
+  mkin << "\n#### depend ####\n\n" << depend_rules(tmp).join
+end
 open(ARGV[0], 'w') {|f|
-  f.puts tmp
+  f.puts mkin
 }