aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--cygwin/GNUmakefile.in9
-rw-r--r--win32/Makefile.sub2
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 51c11957a5..308c33c33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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::