1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,

Browse Source 
ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-12 11:51:42 +00:00
parent 54ba50918e
commit fd7c0279f8
8 changed files with 91 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Nov 12 20:51:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.
Fri Nov 12 16:35:31 2010 NARUSE, Yui <naruse@ruby-lang.org> Fri Nov 12 16:35:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: support C level backtrace information on FreeBSD. * configure.in: support C level backtrace information on FreeBSD.

39
Makefile.in
View File

@ -154,14 +154,12 @@ all:
miniruby$(EXEEXT): miniruby$(EXEEXT):
@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
$(PROGRAM): $(PROGRAM):
@$(RM) $@ @$(RM) $@
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
# We must `rm' the library each time this rule is invoked because "updating" a # We must `rm' the library each time this rule is invoked because "updating" a
# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
@ -169,17 +167,14 @@ $(PROGRAM):
$(LIBRUBY_A): $(LIBRUBY_A):
@$(RM) $@ @$(RM) $@
$(ECHO) linking static-library $@ $(ECHO) linking static-library $@
$(Q) \ $(Q) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
$(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
@-$(RANLIB) $@ 2> /dev/null || true @-$(RANLIB) $@ 2> /dev/null || true
$(LIBRUBY_SO): $(LIBRUBY_SO):
@-$(PRE_LIBRUBY_UPDATE) @-$(PRE_LIBRUBY_UPDATE)
$(ECHO) linking shared-library $@ $(ECHO) linking shared-library $@
$(Q) \ $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
-$(Q) \
$(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \ File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true $(LIBRUBY_ALIASES) || true
@ -196,12 +191,9 @@ $(ruby_pc):
install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE) $(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
$(ECHO) installing cross-compiling stuff $(ECHO) installing cross-compiling stuff
$(Q) \ $(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
$(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby $(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
$(Q) \ $(Q) $(BASERUBY) -p \
sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
$(Q) \
$(BASERUBY) -p \
-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \ -e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \ -e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
rbconfig.rb > fake-rbconfig.rb rbconfig.rb > fake-rbconfig.rb
@ -279,23 +271,19 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
.c.@OBJEXT@: .c.@OBJEXT@:
@$(ECHO) compiling $< @$(ECHO) compiling $<
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
.s.@OBJEXT@: .s.@OBJEXT@:
@$(ECHO) assembling $< @$(ECHO) assembling $<
$(Q) \ $(Q) $(AS) $(ASFLAGS) -o $@ $<
$(AS) $(ASFLAGS) -o $@ $<
.c.S: .c.S:
@$(ECHO) translating $< @$(ECHO) translating $<
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
.c.i: .c.i:
@$(ECHO) preprocessing $< @$(ECHO) preprocessing $<
$(Q) \ $(Q) $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
$(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
clean-local:: clean-local::
@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
@ -344,8 +332,7 @@ clean-capi distclean-capi realclean-capi:
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(ECHO) compiling $@ $(ECHO) compiling $@
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
up:: up::
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)

45
common.mk
View File

@ -164,21 +164,17 @@ miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DM
GORUBY = go$(RUBY_INSTALL_NAME) GORUBY = go$(RUBY_INSTALL_NAME)
golf: $(LIBRUBY) $(GOLFOBJS) PHONY golf: $(LIBRUBY) $(GOLFOBJS) PHONY
$(Q) \ $(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
capi: $(CAPIOUT)/.timestamp PHONY capi: $(CAPIOUT)/.timestamp PHONY
doc/capi/.timestamp: Doxyfile $(PREP) doc/capi/.timestamp: Doxyfile $(PREP)
@$(MAKEDIRS) doc/capi @$(MAKEDIRS) doc/capi
$(ECHO) generating capi $(ECHO) generating capi
$(Q) \ $(Q) $(DOXYGEN) -b
$(DOXYGEN) -b $(Q) $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
$(Q) \
$(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG) Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)" --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
program: $(PROGRAM) program: $(PROGRAM)
@ -379,8 +375,7 @@ post-install-doc::
rdoc: PHONY main rdoc: PHONY main
@echo Generating RDoc documentation @echo Generating RDoc documentation
$(Q) \ $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
$(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
nodoc: PHONY nodoc: PHONY
what-where-doc: no-install-doc what-where-doc: no-install-doc
@ -486,8 +481,7 @@ test-rubyspec: test-rubyspec-precheck
encs: enc trans encs: enc trans
encs enc trans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) encs enc trans: showflags $(ENC_MK) $(LIBRUBY) $(PREP)
$(ECHO) making $@ $(ECHO) making $@
$(Q) \ $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
enc: {$(VPATH)}encdb.h enc: {$(VPATH)}encdb.h
trans: {$(VPATH)}transdb.h trans: {$(VPATH)}transdb.h
@ -495,8 +489,7 @@ trans: {$(VPATH)}transdb.h
$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
$(srcdir)/lib/mkmf.rb $(RBCONFIG) $(srcdir)/lib/mkmf.rb $(RBCONFIG)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
.PRECIOUS: $(MKFILES) .PRECIOUS: $(MKFILES)
@ -750,8 +743,7 @@ srcs-ext: $(EXT_SRCS)
srcs-enc: $(ENC_MK) srcs-enc: $(ENC_MK)
$(ECHO) making srcs under enc $(ECHO) making srcs under enc
$(Q) \ $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
$(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h
@ -760,8 +752,7 @@ insns: $(INSNS)
id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
$(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
node_name.inc: {$(VPATH)}node.h node_name.inc: {$(VPATH)}node.h
@ -769,35 +760,29 @@ node_name.inc: {$(VPATH)}node.h
encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
$(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \ $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
$(PRELUDE_SCRIPTS) $(PREP) $(PRELUDE_SCRIPTS) $(PREP)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
prereq: incs srcs preludes PHONY prereq: incs srcs preludes PHONY

27
cygwin/GNUmakefile.in
View File

@ -41,21 +41,18 @@ scriptbin: $(SCRIPTPROGRAMS)
%$(EXEEXT): bin/% $(STUBPROGRAM) %$(EXEEXT): bin/% $(STUBPROGRAM)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
{ cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
%.res.@OBJEXT@: %.rc %.res.@OBJEXT@: %.rc
$(ECHO) compiling $@ $(ECHO) compiling $@
$(Q) \ $(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(DLL_BASE_NAME) \ -so_name=$(DLL_BASE_NAME) \
. $(icondirs) $(srcdir)/win32 . $(icondirs) $(srcdir)/win32
@ -64,24 +61,20 @@ $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
@rm -f $@ @rm -f $@
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
$(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@ $(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@
@rm -f $@ @rm -f $@
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
$(RUBY_EXP): $(LIBRUBY_A) $(RUBY_EXP): $(LIBRUBY_A)
$(ECHO) creating $@ $(ECHO) creating $@
$(Q) \ $(Q) $(DLLWRAP) \
$(DLLWRAP) \
--output-exp=$(RUBY_EXP) \ --output-exp=$(RUBY_EXP) \
--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM) --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
$(Q) \ $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
@rm -f $(PROGRAM) @rm -f $(PROGRAM)
GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
@ -96,8 +89,7 @@ $(LIBRUBY_SO): $(RUBYDEF)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
clean-local:: clean-local::
@$(RM) $(RUBYDEF) @$(RM) $(RUBYDEF)
@ -105,8 +97,7 @@ clean-local::
ifeq (@target_os@,cygwin) ifeq (@target_os@,cygwin)
cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF) cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) \ $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
@DLLWRAP@ -s --def=$(RUBYDEF) -o $@
endif endif
clean-local:: clean-local::

15
enc/depend
View File

@ -81,8 +81,7 @@ srcs: $(TRANSCSRCS)
<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c: <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
$(ECHO) generating table from $@ $(ECHO) generating table from $@
$(Q) \ $(Q) $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
% unless encs.empty? or trans.empty? % unless encs.empty? or trans.empty?
@ -119,24 +118,20 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
% base = File.basename(e) % base = File.basename(e)
% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
% if df % if df
$(Q) \ $(Q) echo> <%=df%> EXPORTS
echo> <%=df%> EXPORTS $(Q) echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
$(Q) \
echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
% cmd.sub!(/\$\(DEFFILE\)/) {df} % cmd.sub!(/\$\(DEFFILE\)/) {df}
% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"} % cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
% end % end
@$(MAKEDIRS) "$(@D)" @$(MAKEDIRS) "$(@D)"
$(Q) \ $(Q) <%=cmd%>
<%=cmd%>
% end % end
% dependencies.each do |e| % dependencies.each do |e|
<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%> <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
-@$(MAKEDIRS) "$(@D)" -@$(MAKEDIRS) "$(@D)"
$(ECHO) compiling <%= "#{e}.c"%> $(ECHO) compiling <%= "#{e}.c"%>
$(Q) \ $(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
% end % end

21
ext/ripper/depend
View File

@ -16,10 +16,8 @@ ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c \
.y.c: .y.c:
$(ECHO) compiling compiler $< $(ECHO) compiling compiler $<
$(Q) \ $(Q) $(BISON) -t -v -oy.tab.c $<
$(BISON) -t -v -oy.tab.c $< $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
$(Q) \
sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
@$(RM) y.tab.c @$(RM) y.tab.c
all: check all: check
@ -27,28 +25,23 @@ static: check
ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
$(ECHO) extracting $@ from $< $(ECHO) extracting $@ from $<
$(Q) \ $(Q) $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
$(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
check: $(GEN) $(SRC1) $(SRC2) check: $(GEN) $(SRC1) $(SRC2)
$(ECHO) checking $(SRC1) and $(SRC2) $(ECHO) checking $(SRC1) and $(SRC2)
$(Q) \ $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
eventids1.c: $(srcdir)/tools/generate.rb $(SRC1) eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
$(ECHO) generating $@ from $(SRC1) $(ECHO) generating $@ from $(SRC1)
$(Q) \ $(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
$(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2) eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
$(ECHO) generating $@ from $(SRC2) $(ECHO) generating $@ from $(SRC2)
$(Q) \ $(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
$(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
# Entries for Ripper maintainer # Entries for Ripper maintainer
preproc: ripper.E preproc: ripper.E
ripper.E: ripper.c ripper.E: ripper.c
$(ECHO) preprocessing $< $(ECHO) preprocessing $<
$(Q) \ $(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
$(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@

4
lib/mkmf.rb
View File

@ -2005,8 +2005,8 @@ site-install-rb: install-rb
mfile.print "\n\n" mfile.print "\n\n"
if makedef if makedef
mfile.print "$(DEFFILE): #{origdef}\n" mfile.print "$(DEFFILE): #{origdef}\n"
mfile.print "\t$(ECHO) generating $@\n\t$(Q) \\\n" mfile.print "\t$(ECHO) generating $@\n"
mfile.print "\t$(RUBY) #{makedef} #{origdef} > $@\n\n" mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n"
end end
depend = File.join(srcdir, "depend") depend = File.join(srcdir, "depend")

105
win32/Makefile.sub
View File

@ -783,15 +783,11 @@ miniruby: miniruby$(EXEEXT)
miniruby$(EXEEXT): miniruby$(EXEEXT):
@echo $(LIBS) @echo $(LIBS)
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
@$(RM) miniruby.lib miniruby.exp @$(RM) miniruby.lib miniruby.exp
$(Q) \ $(Q) miniruby.exe -v
miniruby.exe -v $(Q) $(LDSHARED_1)
$(Q) \ $(Q) $(LDSHARED_2)
$(LDSHARED_1)
$(Q) \
$(LDSHARED_2)
miniruby.rc: miniruby.rc:
@exit > $@ @exit > $@
@ -799,57 +795,43 @@ miniruby.rc:
!if "$(PROGRAM)" != "" !if "$(PROGRAM)" != ""
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
$(Q) \ $(Q) $(LDSHARED_0)
$(LDSHARED_0) $(Q) $(LDSHARED_1)
$(Q) \ $(Q) $(LDSHARED_2)
$(LDSHARED_1)
$(Q) \
$(LDSHARED_2)
!endif !endif
!if "$(WPROGRAM)" != "" !if "$(WPROGRAM)" != ""
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(ECHO) linking $@ $(ECHO) linking $@
$(Q) \ $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
$(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
-link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows -link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
$(Q) \ $(Q) $(LDSHARED_0)
$(LDSHARED_0) $(Q) $(LDSHARED_1)
$(Q) \ $(Q) $(LDSHARED_2)
$(LDSHARED_1)
$(Q) \
$(LDSHARED_2)
!endif !endif
$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(LIBRUBY_A): $(OBJS) $(DMYEXT)
$(ECHO) linking static-library $@ $(ECHO) linking static-library $@
$(Q) \ $(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
$(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
$(LIBRUBY): $(RUBYDEF) $(LIBRUBY): $(RUBYDEF)
$(ECHO) linking import-library $@ $(ECHO) linking import-library $@
$(Q) \ $(Q) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(DLDOBJS) @echo $(DLDOBJS)
@-$(PRE_LIBRUBY_UPDATE) @-$(PRE_LIBRUBY_UPDATE)
$(ECHO) linking shared-library $@ $(ECHO) linking shared-library $@
$(Q) \ $(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
$(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \ $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
$(LIBRUBY_DLDFLAGS) $(LIBRUBY_DLDFLAGS)
@$(RM) dummy.lib dummy.exp @$(RM) dummy.lib dummy.exp
$(Q) \ $(Q) $(LDSHARED_0)
$(LDSHARED_0) $(Q) $(LDSHARED_1)
$(Q) \ $(Q) $(LDSHARED_2)
$(LDSHARED_1)
$(Q) \
$(LDSHARED_2)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(MINIRUBY) $(srcdir)/win32/mkexports.rb \ $(MINIRUBY) $(srcdir)/win32/mkexports.rb \
@ -934,71 +916,55 @@ $(ruby_pc): $(RBCONFIG)
{$(srcdir)/enc}.c.obj: {$(srcdir)/enc}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.obj: {$(srcdir)/missing}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(srcdir)/win32}.c.obj: {$(srcdir)/win32}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(win_srcdir)}.c.obj: {$(win_srcdir)}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(win_srcdir)/sys}.c.obj: {$(win_srcdir)/sys}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(srcdir)}.c.obj: {$(srcdir)}.c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
.c.obj: .c.obj:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.asm: {$(srcdir)/missing}.c.asm:
$(ECHO) translating $(<:\=/) $(ECHO) translating $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
{$(srcdir)/win32}.c.asm: {$(srcdir)/win32}.c.asm:
$(ECHO) translating $(<:\=/) $(ECHO) translating $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
{$(srcdir)}.c.asm: {$(srcdir)}.c.asm:
$(ECHO) translating $(<:\=/) $(ECHO) translating $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
.c.asm: .c.asm:
$(ECHO) translating $(<:\=/) $(ECHO) translating $(<:\=/)
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.i: {$(srcdir)/missing}.c.i:
$(ECHO) preprocessing $(<:\=/) $(ECHO) preprocessing $(<:\=/)
$(Q) \ $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@
{$(srcdir)/win32}.c.i: {$(srcdir)/win32}.c.i:
$(ECHO) preprocessing $(<:\=/) $(ECHO) preprocessing $(<:\=/)
$(Q) \ $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
{$(srcdir)}.c.i: {$(srcdir)}.c.i:
$(ECHO) preprocessing $(<:\=/) $(ECHO) preprocessing $(<:\=/)
$(Q) \ $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
.c.i: .c.i:
$(ECHO) preprocessing $(<:\=/) $(ECHO) preprocessing $(<:\=/)
$(Q) \ $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
.rc.res: .rc.res:
$(ECHO) compiling $(<:\=/) $(ECHO) compiling $(<:\=/)
$(Q) \ $(Q) $(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
lex.c: {$(srcdir)}lex.c.blt lex.c: {$(srcdir)}lex.c.blt
copy $(?:/=\) $@ copy $(?:/=\) $@
@ -1013,8 +979,7 @@ dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h
ext/extinit.obj: ext/extinit.c $(SETUP) ext/extinit.obj: ext/extinit.c $(SETUP)
$(ECHO) compiling ext/extinit.c $(ECHO) compiling ext/extinit.c
$(Q) \ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
vmtc.inc vm.inc vmtc.inc vm.inc