aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-18 05:05:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-18 05:05:25 +0000
commit874b367bdc09664e209fb163c354bb62168c9317 (patch)
treee19c9c26f13d6aeca78c8e2b88ae94d1cd12ec28
parent0c19240983832840de397dbda8875a2b112ab1db (diff)
downloadruby-874b367bdc09664e209fb163c354bb62168c9317.tar.gz
* enc/depend: get rid of target expanded as empty for nmake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enc/depend10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f1bf36d231..c0ca132e0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 18 14:05:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enc/depend: get rid of target expanded as empty for nmake.
+
Tue Dec 18 07:56:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* proc.c (rb_obj_public_method): Object#public_method to retrieve
diff --git a/enc/depend b/enc/depend
index b115a8a426..de0e092a00 100644
--- a/enc/depend
+++ b/enc/depend
@@ -2,23 +2,23 @@
VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %>
-ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t ")+"\n"%>
-
-ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")+"\n"%>
+ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t ")%><%"\n" if encs.size>1%>
+ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%>
all: $(ENCSOS)
.c.$(OBJEXT):
<%COMPILE_C%>
+! unless encs.empty?
$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
+! end
! encs.each do |e|
-
$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT)
<%LINK_SO.gsub(/\n/, "\n\t")%>
-! end
+! end
! encs.each do |e|
<%e%>.$(OBJEXT): <%e%>.c
! end