summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-11-28 03:12:23 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-11-28 03:12:23 +0000
commit5d6af6910d583a717abf6db67c2bff9156f71ecd (patch)
tree041dbb1422cf4f216cbc2379892c0c5a24b368a3
parent06a97326740909b7ffbef29173473998358ba5f1 (diff)
* 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
-rw-r--r--ChangeLog6
-rw-r--r--lib/mkmf.rb15
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bd54d8..05b8845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 28 12:08:30 2002 Akinori MUSHA <knu@iDaemons.org>
+
+ * 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 <knu@iDaemons.org>
* lib/mkmf.rb: Make sure to dig the destination directory before
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5700583..42d96ef 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
"