* common.mk, */Makefile.sub (lib, dll): phony targets.

* configure.in (ruby, miniruby): ditto.

* cygwin/GNUmakefile.in (rubyw): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Thu Mar 25 14:01:03 2004  Nobuyoshi Nakada  <[email protected]>
+
+	* common.mk, */Makefile.sub (lib, dll): phony targets.
+
+	* configure.in (ruby, miniruby): ditto.
+
+	* cygwin/GNUmakefile.in (rubyw): ditto.
+
 Thu Mar 25 04:16:18 2004  Dave Thomas  <[email protected]>
 
 	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
@@ -11,7 +19,7 @@ Thu Mar 25 03:57:47 2004  Dave Thomas  <[email protected]>
 
 Thu Mar 25 02:00:18 2004  Dave Thomas  <[email protected]>
 
-	* lib/rdoc/generators/template/html/one_page_html.rb (Page): 
+	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
 	  Fix to work with C modules.
 
 Wed Mar 24 20:49:00 2004  Gavin Sinclair <[email protected]>

bcc32/Makefile.sub

@@ -188,12 +188,10 @@ WINMAINOBJ    = winmain.$(OBJEXT)
 
 all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk
 
-!include $(srcdir)/common.mk
-
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
+
+!include $(srcdir)/common.mk
 
 config: config.h config.status
 

common.mk

@@ -1,3 +1,6 @@
+lib: $(LIBRUBY);
+dll: $(LIBRUBY_SO);
+
 EXTCONF       = extconf.rb
 RBCONFIG      = ./.rbconfig.time
 

configure.in

@@ -1481,5 +1481,9 @@ fi
 : > confdefs.h
 
 AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [[sed 's/{\$([^(){}]*)[^{}]*}//g' ${srcdir}/common.mk >> Makefile]])
+AC_CONFIG_FILES(Makefile, [{
+	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
+	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
+	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
 AC_OUTPUT

cygwin/GNUmakefile.in

@@ -28,6 +28,8 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
 EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
 
+rubyw: $(WPROGRAM)
+
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 

win32/Makefile.sub

@@ -173,12 +173,10 @@ WINMAINOBJ    = winmain.$(OBJEXT)
 
 all: $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk
 
-!include $(srcdir)/common.mk
-
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
+
+!include $(srcdir)/common.mk
 
 config: config.h config.status
 

wince/Makefile.sub

@@ -180,8 +180,6 @@ WINMAINOBJ    = wincemain.$(OBJEXT)
 
 all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
 ruby: $(PROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
 
 config: config.h config.status