aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 05:34:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 05:34:25 +0000
commit7485e91f76b7149c421900934adb146913142f8c (patch)
tree9c2fab296d9f1d55fb58238cb48f743c5282f652
parent483225e52199341bb313913a3fdcb5abba4ceb24 (diff)
downloadruby-7485e91f76b7149c421900934adb146913142f8c.tar.gz
* common.mk, enc/depend (enc, trans): targets for sources.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--common.mk7
-rw-r--r--enc/depend5
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d265fa84a8..f75318620b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 16 14:34:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk, enc/depend (enc, trans): targets for sources.
+
+Thu Oct 16 14:30:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * instruby.rb (lib): installs all files other than README etc.
+
Thu Oct 16 06:20:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/ruby/test_transcode.rb (TestTranscode#test_errors):
diff --git a/common.mk b/common.mk
index 84b7460ed9..c4273f1945 100644
--- a/common.mk
+++ b/common.mk
@@ -384,8 +384,11 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
-encs: $(ENC_MK) $(LIBRUBY) $(PREP) transdb.h
- $(MAKE) -f $(ENC_MK) MINIRUBY="$(MINIRUBY)" $(MFLAGS)
+encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
+ $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
+
+enc: {$(VPATH)}encdb.h
+trans: {$(VPATH)}transdb.h
$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
$(srcdir)/lib/mkmf.rb $(RBCONFIG)
diff --git a/enc/depend b/enc/depend
index 1ae1d71a6e..77160482b1 100644
--- a/enc/depend
+++ b/enc/depend
@@ -62,7 +62,10 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
}.join(" ")%>
-all: $(ENCSOS) $(TRANSSOS)
+encs: all
+all: enc trans
+enc: $(ENCSOS)
+trans: $(TRANSSOS)
srcs: $(TRANSCSRCS)