From 3ac20b95903facd49b1f32c0cdb40c290db82016 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 3 Oct 2008 15:49:39 +0000 Subject: [PATCH] * ext/dl/extconf.rb ($distcleanfiles): added callback-?.c into the distclean list. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/dl/extconf.rb | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2d5bae826..7dced5370c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 3 22:43:04 2008 Yuki Sonoda (Yugui) + + * ext/dl/extconf.rb ($distcleanfiles): added callback-?.c into + the distclean list. + Fri Oct 3 19:33:21 2008 NARUSE, Yui * ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency. diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index 8ba6c53d0d..c0b8ffd0a1 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -4,10 +4,14 @@ if( RbConfig::CONFIG['CC'] =~ /gcc/ ) $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer" end +CALLBACKS = (0..8).map{|i| "callback-#{i}"} +CALLBACK_SRCS = CALLBACKS.map{|basename| "#{basename}.c"} +CALLBACK_OBJS = CALLBACKS.map{|basename| "#{basename}.o"} + $INSTALLFILES = [ ["dl.h", "$(HDRDIR)"], ] -$distcleanfiles << "callback.h" +$distcleanfiles += [ "callback.h", *CALLBACK_SRCS ] check = true @@ -25,12 +29,7 @@ else check = false end -$objs = %w[ - cfunc.o dl.o cptr.o handle.o - callback-0.o callback-1.o callback-2.o callback-3.o - callback-4.o callback-5.o callback-6.o callback-7.o - callback-8.o -] +$objs = %w[ cfunc.o dl.o cptr.o handle.o ] + CALLBACK_OBJS if check $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]