diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 08:07:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 08:07:56 +0000 |
| commit | 5095941cca3fed7443af4405d926e15790eb1ece (patch) | |
| tree | fcfaf15c7c5843954940f34a66abee4e68901b89 /enc/depend | |
| parent | 7a8d52c7cd2d8a14e8933a501eda588f47d01653 (diff) | |
| download | ruby-5095941cca3fed7443af4405d926e15790eb1ece.tar.gz ruby-5095941cca3fed7443af4405d926e15790eb1ece.tar.xz ruby-5095941cca3fed7443af4405d926e15790eb1ece.zip | |
* common.mk (enc.mk): depends on rbconfig.rb.
* regenc.h (OnigEncodingDefine): external encoding definition macro.
* enc/Makefile.in: fix for linking.
* enc/depend, enc/make_encmake.rb: fix for Windows.
* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/depend')
| -rw-r--r-- | enc/depend | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/enc/depend b/enc/depend index f5eeafe9d..29ae9154b 100644 --- a/enc/depend +++ b/enc/depend @@ -3,23 +3,43 @@ ! encs = encs.sort_by {|e| e.split(/(\d+)/).map {|n| Integer(n) rescue n}} VPATH = <% %w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(top_srcdir) $(srcdir)].join(CONFIG["PATH_SEPARATOR"]) %> +LIBPATH = <%libpathflag($DEFLIBPATH)%> ENCOBJS = <%encs.map {|e|"#{e}.$(OBJEXT)"}.join(" \\\n\t ")%><%"\n" if encs.size>1%> +ENCDEFS = <%encs.map {|e|"#{e}.def"}.join(" \\\n\t ") if DEFFILE%><%"\n" if encs.size>1%> ENCSOS = <%encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%> all: $(ENCSOS) -.c.$(OBJEXT): +! COMPILE_RULES.each do |rule| +<% rule % %w[c $(OBJEXT)] %> <%COMPILE_C%> + +! end ! unless encs.empty? $(ENCOBJS): regenc.h oniguruma.h config.h defines.h +! encs.each do |e| +<%e%>.so: $(ENCSODIR)/<%e%>.$(DLEXT) ! end + +! end +! link_so = LINK_SO.gsub(/\n/, "\n\t") ! encs.each do |e| -$(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT) - <%LINK_SO.gsub(/\n/, "\n\t")%> +! deps = "#{e}.$(OBJEXT)" +! deps << " #{e}-$(arch).def" if DEFFILE +$(ENCSODIR)/<%e%>.$(DLEXT): <%deps%> + <%link_so.sub(/\$\(OBJS\)/, deps)%> + +! end +! if DEFFILE +! encs.each do |e| +<%e%>-$(arch).def: + echo EXPORTS > $@ + echo <%EXPORT_PREFIX%>Init_<%e.upcase%> >> $@ +! end ! end ! encs.each do |e| <%e%>.$(OBJEXT): <%e%>.c @@ -27,6 +47,7 @@ $(ENCSODIR)/<%e%>.$(DLEXT): <%e%>.$(OBJEXT) clean: $(RM) $(ENCSOS) + $(RM) $(ENCDEFS) $(RM) $(ENCOBJS) distclean: clean |