diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-12 11:51:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-12 11:51:42 +0000 |
| commit | fd7c0279f87411d77beadd232fc208b0a0d8f9e4 (patch) | |
| tree | 7871cb26ac6f2a0a58c2231578310d2d91ec1bfd /Makefile.in | |
| parent | 54ba50918e6ebb38ce36a7cfce7751855d86c947 (diff) | |
* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
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
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/Makefile.in b/Makefile.in index 35b10dd6f7..b727ba398d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -154,14 +154,12 @@ all: miniruby$(EXEEXT): @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@ $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@ # 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 @@ -169,17 +167,14 @@ $(PROGRAM): $(LIBRUBY_A): @$(RM) $@ $(ECHO) linking static-library $@ - $(Q) \ - $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) + $(Q) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) $(ECHO) linking shared-library $@ - $(Q) \ - $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ - -$(Q) \ - $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ + $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ + -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true @@ -196,12 +191,9 @@ $(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 \ + $(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}]' \ rbconfig.rb > fake-rbconfig.rb @@ -279,23 +271,19 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd .c.@OBJEXT@: @$(ECHO) compiling $< - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< .s.@OBJEXT@: @$(ECHO) assembling $< - $(Q) \ - $(AS) $(ASFLAGS) -o $@ $< + $(Q) $(AS) $(ASFLAGS) -o $@ $< .c.S: @$(ECHO) translating $< - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $< + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $< .c.i: @$(ECHO) preprocessing $< - $(Q) \ - $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ + $(Q) $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ clean-local:: @$(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) $(ECHO) compiling $@ - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c up:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) |