summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 02:03:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-27 02:03:54 +0000
commitc938de20cd80f18375d2cf198ce58033f2d32be7 (patch)
tree56b62871db9d335ff29906fd1240272e4bdf0231 /common.mk
parent882cb2e37d2beb0b34e886754ab5d8ab842abc86 (diff)
* common.mk (distclean-enc, realclean-enc): do not call clean of
enc.mk twice or more. * enc/depend (cleanobjs): added deffile. * lib/mkmf.rb (create_makefile): removes deffile at clean instead of distclean. * win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp files. * win32/Makefile.sub (clean, distclean): have moved to common.mk. * win32/rmdirs.bat: omits `not empty' message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index 6866182fe2..0b4f6e307b 100644
--- a/common.mk
+++ b/common.mk
@@ -346,8 +346,6 @@ clean-local::
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
@$(RM) *.inc y.tab.c y.output encdb.h transdb.h
clean-ext::
-clean-enc:
- @-$(MAKE) -f $(ENC_MK) $(MFLAGS) clean
clean-golf:
@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
clean-rdoc:
@@ -360,8 +358,6 @@ distclean-local:: clean-local
@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
distclean-ext::
-distclean-enc: clean-enc
- @-$(MAKE) -f $(ENC_MK) $(MFLAGS) distclean
distclean-golf: clean-golf
@$(RM) $(GOLFPRELUDES)
distclean-rdoc:
@@ -372,10 +368,13 @@ realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean
realclean-local:: distclean-local
@$(RM) parse.c parse.h lex.c newline.c revision.h
realclean-ext::
-realclean-enc:: distclean-enc
realclean-golf: distclean-golf
realclean-extout: distclean-extout
+clean-enc distclean-enc realclean-enc:
+ @echo $(@:-enc=ing) encodings
+ @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
+
check: test test-all
btest: miniruby$(EXEEXT) PHONY