yugui	2009-04-19 22:34:00 +0900 (Sun, 19 Apr 2009)

  New Revision: 23222

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

  Log:
    merges r23035 from trunk into ruby_1_9_1.
    --
    * enc/depend (link_so): replaces $(TARGET) with basename of the
      target.  [ruby-talk:330286]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enc/depend

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23221)
+++ ruby_1_9_1/ChangeLog	(revision 23222)
@@ -1,3 +1,8 @@
+Mon Mar 23 06:51:16 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/depend (link_so): replaces $(TARGET) with basename of the
+	  target.  [ruby-talk:330286]
+
 Wed Mar 18 02:41:33 2009  Masatoshi SEKI  <m_seki@m...>
 
 	* lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
Index: ruby_1_9_1/enc/depend
===================================================================
--- ruby_1_9_1/enc/depend	(revision 23221)
+++ ruby_1_9_1/enc/depend	(revision 23222)
@@ -1,3 +1,5 @@
+% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
+% dldflags = $2
 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
 % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
 % encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
@@ -102,12 +104,17 @@
 %   obj = "enc/#{e}.$(OBJEXT)"
 %   df = ("enc/#{e}.def" if deffile)
 $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
+%   cmd = link_so.sub(/\$\(OBJS\)/) {obj}
+%   base = File.basename(e)
+%   cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
 %   if df
 	echo> <%=df%> EXPORTS
-	echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%>
+	echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
+%     cmd.sub!(/\$\(DEFFILE\)/) {df}
+%     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
 %   end
 	@$(MAKEDIRS) "$(@D)"
-	<%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%>
+	<%=cmd%>
 
 % end
 % dependencies.each do |e|

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