From 6c5115379daaa7d971190729099379005c66d72d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Nov 2010 13:03:42 +0000
Subject: 	* cygwin/GNUmakefile.in: shorten messages.

	* 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
---
 Makefile.in           |  6 ++++++
 cygwin/GNUmakefile.in | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 18e3b320c8..35b10dd6f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,8 +195,12 @@ $(ruby_pc):
 
 install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
 	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
+	$(ECHO) installing cross-compiling stuff
+	$(Q) \
 	$(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
+	$(Q) \
 	sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
+	$(Q) \
 	$(BASERUBY) -p \
 	-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
 	-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)
+	$(ECHO) compiling $@
+	$(Q) \
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 up::
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 208d14d545..fa1864340d 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -40,16 +40,22 @@ stub: $(STUBPROGRAM)
 scriptbin: $(SCRIPTPROGRAMS)
 
 %$(EXEEXT): bin/% $(STUBPROGRAM)
+	$(ECHO) generating $@
+	$(Q) \
 	{ cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 
 %.res.@OBJEXT@: %.rc
+	$(ECHO) compiling $@
+	$(Q) \
 	$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
 $(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) \
 	  -so_name=$(DLL_BASE_NAME) \
 	  . $(icondirs) $(srcdir)/win32
@@ -57,17 +63,24 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
 $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	@rm -f $@
+	$(ECHO) linking $@
+	$(Q) \
 	$(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 $(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@
 	@rm -f $@
+	$(ECHO) linking $@
+	$(Q) \
 	$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
 	  stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBY_EXP): $(LIBRUBY_A)
+	$(ECHO) creating $@
+	$(Q) \
 	$(DLLWRAP) \
 	  --output-exp=$(RUBY_EXP) \
 	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
+	$(Q) \
 	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
 	@rm -f $(PROGRAM)
 
@@ -82,6 +95,8 @@ endif
 $(LIBRUBY_SO): $(RUBYDEF)
 
 $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+	$(ECHO) generating $@
+	$(Q) \
 	$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
 clean-local::
@@ -89,6 +104,8 @@ clean-local::
 
 ifeq (@target_os@,cygwin)
 cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
+	$(ECHO) generating $@
+	$(Q) \
 	@DLLWRAP@ -s --def=$(RUBYDEF) -o $@
 endif
 
-- 
cgit v1.2.3