diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-28 07:25:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-28 07:25:42 +0000 |
commit | 47f86aae0a89c95a0093e5cac1df30c487a54db7 (patch) | |
tree | b2cf7b57dc6d455ad33975ecd7db10bc059a2ebe | |
parent | b81df5d837ac72bee85cde0624d747a7250f20ab (diff) |
* cygwin/GNUmakefile.in (clean-local, distclean-local): remove
work files.
* win32/Makefile.sub (clean-local): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | cygwin/GNUmakefile.in | 9 | ||||
-rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Sun Mar 28 16:25:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * cygwin/GNUmakefile.in (clean-local, distclean-local): remove + work files. + + * win32/Makefile.sub (clean-local): ditto. + Sun Mar 28 14:23:02 2004 Minero Aoki <aamine@loveruby.net> * lib/net/pop.rb: def m( arg ) -> def m(arg). @@ -26,7 +33,7 @@ Sat Mar 27 01:47:09 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> Thu Mar 25 23:15:24 2004 Dave Thomas <dave@pragprog.com> - * lib/rdoc/ri/ri_options.rb (RI::Options::show_version): + * lib/rdoc/ri/ri_options.rb (RI::Options::show_version): Add --version option Thu Mar 25 21:45:00 2004 Shigeo Kobayashi <shigek@ruby-lang.org> diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index efcefe792b..0287540438 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -27,6 +27,7 @@ endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) +RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc rubyw: $(WPROGRAM) @@ -36,7 +37,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc: $(RBCONFIG) +$(RCFILES): $(RBCONFIG) @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) \ @@ -68,3 +69,9 @@ cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A) @DLLWRAP@ -s --def=rubydll.def -o $@ @rm -f rubydll.def endif + +clean-local:: + @$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@) + +distclean-local:: + @$(RM) $(RCFILES) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 16636c364c..6b6a17e9f8 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -408,7 +408,7 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(AR) $(ARFLAGS)$@ -def:$< clean-local:: - @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb + @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res distclean-local:: |