* win32/Makefile.sub: shorten messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
430da2ad30
commit
5937e8d5d6
@ -782,10 +782,15 @@ miniruby: miniruby$(EXEEXT)
|
|||||||
|
|
||||||
miniruby$(EXEEXT):
|
miniruby$(EXEEXT):
|
||||||
@echo $(LIBS)
|
@echo $(LIBS)
|
||||||
|
$(ECHO) linking $@
|
||||||
|
$(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) \
|
||||||
miniruby.exe -v
|
miniruby.exe -v
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_1)
|
$(LDSHARED_1)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_2)
|
$(LDSHARED_2)
|
||||||
|
|
||||||
miniruby.rc:
|
miniruby.rc:
|
||||||
@ -793,38 +798,57 @@ miniruby.rc:
|
|||||||
|
|
||||||
!if "$(PROGRAM)" != ""
|
!if "$(PROGRAM)" != ""
|
||||||
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
|
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
|
||||||
|
$(ECHO) linking $@
|
||||||
|
$(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) \
|
||||||
$(LDSHARED_0)
|
$(LDSHARED_0)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_1)
|
$(LDSHARED_1)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_2)
|
$(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 $@
|
||||||
|
$(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) \
|
||||||
$(LDSHARED_0)
|
$(LDSHARED_0)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_1)
|
$(LDSHARED_1)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_2)
|
$(LDSHARED_2)
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
$(LIBRUBY_A): $(OBJS) $(DMYEXT)
|
$(LIBRUBY_A): $(OBJS) $(DMYEXT)
|
||||||
|
$(ECHO) linking static-library $@
|
||||||
|
$(Q) \
|
||||||
$(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
|
$(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
|
||||||
|
|
||||||
$(LIBRUBY): $(RUBYDEF)
|
$(LIBRUBY): $(RUBYDEF)
|
||||||
|
$(ECHO) linking import-library $@
|
||||||
|
$(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 $@
|
||||||
|
$(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) \
|
||||||
$(LDSHARED_0)
|
$(LDSHARED_0)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_1)
|
$(LDSHARED_1)
|
||||||
|
$(Q) \
|
||||||
$(LDSHARED_2)
|
$(LDSHARED_2)
|
||||||
|
|
||||||
$(RUBYDEF): $(LIBRUBY_A) $(PREP)
|
$(RUBYDEF): $(LIBRUBY_A) $(PREP)
|
||||||
@ -909,39 +933,71 @@ $(ruby_pc): $(RBCONFIG)
|
|||||||
$(srcdir)/template/ruby.pc.in > $@
|
$(srcdir)/template/ruby.pc.in > $@
|
||||||
|
|
||||||
{$(srcdir)/enc}.c.obj:
|
{$(srcdir)/enc}.c.obj:
|
||||||
|
$(ECHO) compiling $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
|
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
|
||||||
{$(srcdir)}.c.obj:
|
{$(srcdir)}.c.obj:
|
||||||
|
$(ECHO) compiling $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
|
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
|
||||||
.c.obj:
|
.c.obj:
|
||||||
|
$(ECHO) compiling $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
|
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
|
||||||
{$(srcdir)}.c.asm:
|
{$(srcdir)}.c.asm:
|
||||||
|
$(ECHO) translating $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
|
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/)
|
||||||
.c.asm:
|
.c.asm:
|
||||||
|
$(ECHO) translating $(<:\=/)
|
||||||
|
$(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 $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@
|
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@
|
||||||
{$(srcdir)/win32}.c.i:
|
{$(srcdir)/win32}.c.i:
|
||||||
|
$(ECHO) preprocessing $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
||||||
{$(srcdir)}.c.i:
|
{$(srcdir)}.c.i:
|
||||||
|
$(ECHO) preprocessing $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
||||||
.c.i:
|
.c.i:
|
||||||
|
$(ECHO) preprocessing $(<:\=/)
|
||||||
|
$(Q) \
|
||||||
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
$(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/)
|
||||||
|
|
||||||
.rc.res:
|
.rc.res:
|
||||||
|
$(ECHO) compiling $(<:\=/)
|
||||||
|
$(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
|
||||||
@ -956,6 +1012,8 @@ $(OBJS): {$(hdrdir)/ruby}win32.h
|
|||||||
dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h
|
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
|
||||||
|
$(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 \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user