From f9da3539ed166d30e0bd797f6e1d7675da1e0359 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Mar 2004 13:50:48 +0000
Subject: [PATCH] * Makefile.in, */Makefile.sub, mkconfig.rb: keep rbconfig.rb
 old if   unchanged.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 bcc32/Makefile.sub | 12 +++++++-----
 win32/Makefile.sub | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 3502b23a26..d1a73c6270 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
+MAKEFILES = Makefile $(srcdir)bcc32/Makefile.sub
 
 #### Start of system configuration section. ####
 OS = bccwin32
@@ -162,6 +163,8 @@ LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
 
+PREP          = miniruby$(EXEEXT)
+
 !ifndef EXTOBJS
 EXTOBJS       = dmyext.obj
 !endif
@@ -213,8 +216,7 @@ SCRIPT_ARGS   =	"--dest-dir=$(DESTDIR)" \
 		"--make-flags=$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
 
-all:		miniruby$(EXEEXT) rbconfig.rb \
-		$(LIBRUBY) $(MISCLIBS)
+all:		$(PREP) rbconfig.rb $(LIBRUBY) $(MISCLIBS)
 		@$(MINIRUBY) $(srcdir)ext/extmk.rb $(EXTMK_ARGS)
 
 ruby: $(PROGRAM)
@@ -298,7 +300,7 @@ config.h:
 \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 |
 
-config.status: Makefile $(srcdir)bcc32/Makefile.sub
+config.status: $(MAKEFILES)
 	@echo Creating $@
 	@type > $@ &&|
 # Generated automatically by Makefile.sub.
@@ -425,7 +427,7 @@ $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		@echo $(EXTOBJS)
 		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
 
-$(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
+$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
 install:	install-nodoc $(RDOCTARGET)
@@ -515,7 +517,7 @@ extconf:
 		$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
 		$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-rbconfig.rb:	miniruby$(EXEEXT) config.status
+rbconfig.rb:	$(PREP) config.status
 		@$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \
 			-install_name=$(RUBY_INSTALL_NAME) \
 			-so_name=$(RUBY_SO_NAME) rbconfig.rb
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ea3d0512f9..e90a4be83a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
+MAKEFILES = Makefile $(srcdir)/wince/Makefile.sub
 
 #### Start of system configuration section. ####
 
@@ -154,6 +155,8 @@ LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
 
+PREP          = miniruby$(EXEEXT)
+
 !if !defined(EXTSTATIC)
 EXTSTATIC     = 
 !endif
@@ -209,8 +212,7 @@ SCRIPT_ARGS   =	"--dest-dir=$(DESTDIR)" \
 		"--make-flags=$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
 
-all:		ext miniruby$(EXEEXT) rbconfig.rb \
-		$(LIBRUBY) $(MISCLIBS)
+all:		ext rbconfig.rb $(LIBRUBY) $(MISCLIBS)
 		@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
 
 ext:
@@ -312,7 +314,7 @@ config.h:
 #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
 <<KEEP
 
-config.status: Makefile $(srcdir)/win32/Makefile.sub
+config.status: $(MAKEFILES)
 	@echo Creating <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
@@ -440,7 +442,7 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res
 		$(LIBRUBY_LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
 			-Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS)
 
-$(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
+$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
 {$(srcdir)/win32}.def.lib:
@@ -531,7 +533,7 @@ extconf:
 		$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
 		$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-rbconfig.rb:	miniruby$(EXEEXT) config.status
+rbconfig.rb:	$(PREP) config.status
 		@$(MINIRUBY) $(srcdir)/mkconfig.rb -srcdir=$(srcdir) \
 			-install_name=$(RUBY_INSTALL_NAME) \
 			-so_name=$(RUBY_SO_NAME) rbconfig.rb