From 0c39e263ade8f892d4e951ffb0a0cbf97008c362 Mon Sep 17 00:00:00 2001 From: michal Date: Tue, 21 Jan 2003 19:33:19 +0000 Subject: makes possible to add files to clean and distclean targets git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/mkmf.rb | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50b3539af..70d519ce7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jan 21 20:29:31 2003 Michal Rokos + + * mkmf.rb: make possible to add files to clean and distclean targets + Tue Jan 21 18:05:25 2003 Nobuyoshi Nakada * bcc32/Makefile.sub (LIBRUBY_A): link dmyext. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8479da5df..df518c193 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -639,8 +639,6 @@ def create_makefile(target, srcprefix = nil) target = nil if $objs == "" - cleanfiles = [] - distcleanfiles = [] if target and EXPORT_PREFIX origdef = target + '.def' deffile = EXPORT_PREFIX + origdef @@ -665,7 +663,7 @@ def create_makefile(target, srcprefix = nil) end end end - distcleanfiles << deffile unless deffile == origdef + $distcleanfiles << deffile unless deffile == origdef end libpath = libpathflag(libpath) @@ -677,8 +675,8 @@ def create_makefile(target, srcprefix = nil) LIBPATH = #{libpath} DEFFILE = #{deffile} -CLEANFILES = #{cleanfiles.join(' ')} -DISTCLEANFILES = #{distcleanfiles.join(' ')} +CLEANFILES = #{$cleanfiles.join(' ')} +DISTCLEANFILES = #{$distcleanfiles.join(' ')} target_prefix = #{target_prefix} LOCAL_LIBS = #{$LOCAL_LIBS} @@ -809,11 +807,14 @@ def init_mkmf(config = CONFIG) end $LOCAL_LIBS = "" + + $cleanfiles = [] + $distcleanfiles = [] + dir_config("opt") end init_mkmf -dir_config("opt") $make = with_config("make-prog", ENV["MAKE"] || "make") make, = Shellwords.shellwords($make) -- cgit