[cairo-commit] rcairo ChangeLog,1.220,1.221 extconf.rb,1.18,1.19
Kouhei Sutou
commit at pdx.freedesktop.org
Fri Apr 4 07:00:19 PDT 2008
Committed by: kou
Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv2319
Modified Files:
ChangeLog extconf.rb
Log Message:
* extconf.rb: cleanup libruby-cairo.a.
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- ChangeLog 4 Apr 2008 13:55:57 -0000 1.220
+++ ChangeLog 4 Apr 2008 14:04:26 -0000 1.221
@@ -1,5 +1,7 @@
2008-04-04 Kouhei Sutou <kou at cozmixng.org>
+ * extconf.rb: cleanup libruby-cairo.a.
+
* extconf.rb: support building with Wine + MinGW on my Linux
environment.
Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- extconf.rb 4 Apr 2008 13:55:57 -0000 1.18
+++ extconf.rb 4 Apr 2008 14:04:26 -0000 1.19
@@ -37,10 +37,10 @@
end
end
-def set_output_lib(target_name)
+def set_output_lib(target_name, directory=nil)
case RUBY_PLATFORM
when /cygwin|mingw/
- filename = "libruby-#{target_name}.a"
+ filename = File.join(*([directory, "libruby-#{target_name}.a"].compact))
if RUBY_VERSION > "1.8.0"
$DLDFLAGS << ",--out-implib=#{filename}"
elsif RUBY_VERSION > "1.8"
@@ -50,6 +50,7 @@
$DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
$DLDFLAGS << " --output-lib #{filename}"
end
+ $cleanfiles << filename
when /mswin32/
$DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
$DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
@@ -83,7 +84,7 @@
check_win32
target_name = File.basename(modname)
-set_output_lib(target_name)
+set_output_lib(target_name, ext_dir_name)
$defs << "-DRB_CAIRO_COMPILATION"
create_makefile(modname, srcdir)
More information about the cairo-commit
mailing list