diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-10 02:45:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-10 02:45:18 +0000 |
| commit | e3d9fc76e62c8a1857abdafda948ff7d2918cfc8 (patch) | |
| tree | ae214bcbccf8f2993c7f5ef5c233620083188538 /enc | |
| parent | 2ce7aeca6edf4610d6b1d890fbe659379b4b8f9f (diff) | |
* enc/Makefile.in (make-workdir): use MAKEDIRS.
* enc/depend: makes target directory before compile/link.
* tool/transcode-tblgen.rb: creates target directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 5 | ||||
| -rw-r--r-- | enc/depend | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 103ad6b9ae..cc3d99d397 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -46,13 +46,14 @@ DLDFLAGS = $(ldflags) $(dldflags) $(archflag) WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans RM = @RM@ +MAKEDIRS = @MAKEDIRS@ .SUFFIXES: .erb.c -all srcs: make-workdir +all: make-workdir make-workdir: - $(MINIRUBY) -run -e mkdir -- -p $(WORKDIRS) + $(MAKEDIRS) $(WORKDIRS) clean: diff --git a/enc/depend b/enc/depend index a18df490ea..d413898689 100644 --- a/enc/depend +++ b/enc/depend @@ -23,7 +23,7 @@ % cleanobjs = Shellwords.shellwords(CONFIG["cleanobjs"] || "") % rule_subst = CONFIG["RULE_SUBST"] || "%s" % if File::ALT_SEPARATOR -% pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\((\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")} +% pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")} % else % pathrep = proc {|path| path} % end @@ -59,6 +59,7 @@ srcs: $(TRANSCSRCS) % end % compile_rules.each do |rule| <%= rule % %w[c $(OBJEXT)] %> + @$(MAKEDIRS) "$(@D)" <%=COMPILE_C%> % end @@ -89,6 +90,7 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%> echo EXPORTS > <%=df%> echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%> % end + @$(MAKEDIRS) "$(@D)" <%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%> % end |