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

* cygwin/GNUmakefile.in: shorten messages.

Browse Source 
* Makefile.in (install-cross, ext/extinit.o): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-11 13:03:42 +00:00
parent 41131d4215
commit 6c5115379d
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -195,8 +195,12 @@ $(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
$(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 sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
$(Q) \
$(BASERUBY) -p \ $(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}]' \
@ -339,6 +343,8 @@ clean-capi distclean-capi realclean-capi:
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(ECHO) compiling $@
$(Q) \
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
up:: up::

19
cygwin/GNUmakefile.in
View File

@ -40,16 +40,22 @@ stub: $(STUBPROGRAM)
scriptbin: $(SCRIPTPROGRAMS) scriptbin: $(SCRIPTPROGRAMS)
%$(EXEEXT): bin/% $(STUBPROGRAM) %$(EXEEXT): bin/% $(STUBPROGRAM)
$(ECHO) generating $@
$(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 $@
$(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
@$(MINIRUBY) $(srcdir)/win32/resource.rb \ $(ECHO) generating $@
$(Q) \
$(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
@ -57,17 +63,24 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
@rm -f $@ @rm -f $@
$(ECHO) linking $@
$(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 $@
$(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 $@
$(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) \
$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
@rm -f $(PROGRAM) @rm -f $(PROGRAM)
@ -82,6 +95,8 @@ endif
$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO): $(RUBYDEF)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
$(ECHO) generating $@
$(Q) \
$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
clean-local:: clean-local::
@ -89,6 +104,8 @@ 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 $@
$(Q) \
@DLLWRAP@ -s --def=$(RUBYDEF) -o $@ @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
endif endif