diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:07 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-12 14:54:07 +0000 |
| commit | eee0bc0c247c927238ac0010b1028a321eb92954 (patch) | |
| tree | 95737098b41e7993d76f21afafddcc124b4caeeb | |
| parent | 9ea87e2ca4be9fccbbaa79ce0bf20f7deb3177df (diff) | |
merges r20582 from trunk into ruby_1_9_1.
* enc/depend (clean-srcs): split out from clean.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | enc/Makefile.in | 2 | ||||
| -rw-r--r-- | enc/depend | 10 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Dec 9 00:17:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/depend (clean-srcs): split out from clean. + Mon Dec 8 23:34:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. diff --git a/enc/Makefile.in b/enc/Makefile.in index d9bb8fd68e..8ba04f374a 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -59,5 +59,5 @@ make-workdir: clean: -distclean: clean +distclean: clean clean-srcs @$(RM) enc.mk diff --git a/enc/depend b/enc/depend index 938b15bb25..0cc00336be 100644 --- a/enc/depend +++ b/enc/depend @@ -128,9 +128,15 @@ enc/encdb.$(OBJEXT): encdb.h enc/trans/transdb.$(OBJEXT): transdb.h clean: -% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(TRANSCSRCS)].each do |clean| +% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean| @$(RM) <%=pathrep[clean]%> % end -% %w[$(ENCSODIR)/trans $(ENCSODIR) enc/trans enc].each do|dir| +% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir| + @-rmdir <%=pathrep[dir]%> +% end + +clean-srcs: + @$(RM) <%=pathrep['$(TRANSCSRCS)']%> +% %w[enc/trans enc].each do|dir| @-rmdir <%=pathrep[dir]%> % end |