From 5d6af6910d583a717abf6db67c2bff9156f71ecd Mon Sep 17 00:00:00 2001 From: knu Date: Thu, 28 Nov 2002 03:12:23 +0000 Subject: [PATCH] * lib/mkmf.rb: Avoid the use of "clean::" in favor of "clean:" in order not to let make(1) choke if there is another dependency on the target added in a depend file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bd54d8419..05b8845d95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 28 12:08:30 2002 Akinori MUSHA + + * lib/mkmf.rb: Avoid the use of "clean::" in favor of "clean:" in + order not to let make(1) choke if there is another dependency on + the target added in a depend file. + Thu Nov 28 02:40:42 2002 Akinori MUSHA * lib/mkmf.rb: Make sure to dig the destination directory before diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 57005836aa..42d96ef590 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -686,11 +686,10 @@ RUBYARCHDIR = $(sitearchdir)$(target_prefix) } end mfile.print %{ -all: $(DLLIB) +CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) +CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" -clean:: - @$(RM) "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) - @$(RM) "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" +all: $(DLLIB) } mfile.print CLEANINGS dirs = [] @@ -848,12 +847,12 @@ LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' LIBARG = config_string('LIBARG') || '-l%s' CLEANINGS = " -clean:: - @$(RM) $(CLEANFILES) +clean: + @$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) -distclean:: clean +distclean: clean @$(RM) Makefile extconf.h conftest.* mkmf.log @$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) -realclean:: distclean +realclean: distclean "