summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-25 05:01:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-25 05:01:15 +0000
commit3b79d34d990e285521e23e4f792f91b4cb815460 (patch)
tree2a87b0640f0373a58e6fa0079acd698893d71e80
parentd01fac5573dea2168abdfa546190b8c9a2111c88 (diff)
* 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
-rw-r--r--ChangeLog10
-rw-r--r--bcc32/Makefile.sub6
-rw-r--r--common.mk3
-rw-r--r--configure.in6
-rw-r--r--cygwin/GNUmakefile.in2
-rw-r--r--win32/Makefile.sub6
-rw-r--r--wince/Makefile.sub2
7 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e3b859..4904ca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 25 14:01:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 <dave@pragprog.com>
* 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 <dave@pragprog.com>
Thu Mar 25 02:00:18 2004 Dave Thomas <dave@pragprog.com>
- * 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 <gsinclair@soyabean.com.au>
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index b30324b..7c9770c 100644
--- a/bcc32/Makefile.sub
+++ b/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
diff --git a/common.mk b/common.mk
index 44221a8..ed51675 100644
--- a/common.mk
+++ b/common.mk
@@ -1,3 +1,6 @@
+lib: $(LIBRUBY);
+dll: $(LIBRUBY_SO);
+
EXTCONF = extconf.rb
RBCONFIG = ./.rbconfig.time
diff --git a/configure.in b/configure.in
index 1135ea6..0642665 100644
--- a/configure.in
+++ b/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
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index fe6fd3b..efcefe7 100644
--- a/cygwin/GNUmakefile.in
+++ b/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@
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index f8d0d51..16636c3 100644
--- a/win32/Makefile.sub
+++ b/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
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 7899670..88ea02d 100644
--- a/wince/Makefile.sub
+++ b/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