[cairo-commit] rcairo ChangeLog,1.214,1.215 extconf.rb,1.10,1.11

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv12135

Modified Files:
	ChangeLog extconf.rb 
Log Message:
* extconf.rb: substitute DLLIB not TARGET.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- ChangeLog	4 Apr 2008 04:13:14 -0000	1.214
+++ ChangeLog	4 Apr 2008 04:17:26 -0000	1.215
@@ -1,5 +1,7 @@
 2008-04-04  Kouhei Sutou  <kou at cozmixng.org>
 
+	* extconf.rb: substitute DLLIB not TARGET.
+
 	* pkg-config.rb: fix substitution for MSVC.
 
 	* extconf.rb: support output option for MSVC.

Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- extconf.rb	4 Apr 2008 03:59:04 -0000	1.10
+++ extconf.rb	4 Apr 2008 04:17:26 -0000	1.11
@@ -93,8 +93,8 @@
   co = nil
   makefile.each_line do |line|
     case line
-    when /^TARGET\s*=\s*/
-      f.print("TARGET = #{ext_dir_name}/#{$POSTMATCH}")
+    when /^DLLIB\s*=\s*/
+      f.print("DLLIB = #{ext_dir_name}/#{$POSTMATCH}")
     when /^(SRCS)\s*=\s*/
       name = $1
       vars = $POSTMATCH.split.collect {|var| "$(srcdir)/#{var}"}.join(" ")
@@ -106,14 +106,7 @@
       vars = vars.join(" ")
       f.puts("#{name} = #{vars}")
     when /^\t\$\(CC\)/
-      if PKGConfig.msvc?
-        output_option = "/Fo"
-      else
-        output_option = "-o"
-      end
-      unless /#{Regexp.escape(output_option)}/ =~ line
-        line = "#{line.chomp} #{output_option}$@"
-      end
+      line = "#{line.chomp} -o $@" if /-o/ !~ line
       co = line
       f.puts(line)
     else
@@ -124,7 +117,7 @@
   if co and !objs.empty?
     f.puts
     objs.each do |obj|
-      f.puts "#{obj}: $(srcdir)/#{File.basename(obj).sub(/\..+?$/, '.c')}"
+      f.puts "#{obj}: $(srcdir)/#{File.basename(obj).sub(/.o$/, '.c')}"
       f.puts co
     end
   end