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

* common.mk (NULLCMD): dummy command.

Browse Source 
* bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
  command-less double-colon rules.  [ruby-dev:29676]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-10-19 23:44:00 +00:00
parent 96117996a0
commit 40fc1a8025
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (NULLCMD): dummy command.
* bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
command-less double-colon rules. [ruby-dev:29676]
Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook. * bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.

12
bcc32/Makefile.sub
View File

@ -447,17 +447,17 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
. $(icondirs) $(srcdir)win32 . $(icondirs) $(srcdir)win32
post-install-bin:: post-install-bin::
@exit > $@ @$(NULLCMD)
post-install-lib:: post-install-lib::
@exit > $@ @$(NULLCMD)
post-install-ext-comm:: post-install-ext-comm::
@exit > $@ @$(NULLCMD)
post-install-ext-arch:: post-install-ext-arch::
@exit > $@ @$(NULLCMD)
post-install-man:: post-install-man::
@exit > $@ @$(NULLCMD)
post-install-doc:: post-install-doc::
@exit > $@ @$(NULLCMD)
clean-local:: clean-local::
@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib

13
common.mk
View File

@ -3,6 +3,7 @@ lib: $(LIBRUBY)
dll: $(LIBRUBY_SO) dll: $(LIBRUBY_SO)
RUBYOPT = RUBYOPT =
NULLCMD =
STATIC_RUBY = static-ruby STATIC_RUBY = static-ruby
@ -137,30 +138,35 @@ pre-install-bin:: install-prereq
do-install-bin: do-install-bin:
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin
post-install-bin:: post-install-bin::
@$(NULLCMD)
install-lib: pre-install-lib do-install-lib post-install-lib install-lib: pre-install-lib do-install-lib post-install-lib
pre-install-lib:: install-prereq pre-install-lib:: install-prereq
do-install-lib: do-install-lib:
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib
post-install-lib:: post-install-lib::
@$(NULLCMD)
install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
pre-install-ext-comm:: install-prereq pre-install-ext-comm:: install-prereq
do-install-ext-comm: do-install-ext-comm:
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm
post-install-ext-comm:: post-install-ext-comm::
@$(NULLCMD)
install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
pre-install-ext-arch:: install-prereq pre-install-ext-arch:: install-prereq
do-install-ext-arch: do-install-ext-arch:
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch
post-install-ext-arch:: post-install-ext-arch::
@$(NULLCMD)
install-man: pre-install-man do-install-man post-install-man install-man: pre-install-man do-install-man post-install-man
pre-install-man:: install-prereq pre-install-man:: install-prereq
do-install-man: do-install-man:
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-install-man:: post-install-man::
@$(NULLCMD)
what-where: no-install what-where: no-install
no-install: no-install-nodoc no-install-doc no-install: no-install-nodoc no-install-doc
@ -208,6 +214,7 @@ pre-no-install-bin:: install-prereq
dont-install-bin: dont-install-bin:
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin
post-no-install-bin:: post-no-install-bin::
@$(NULLCMD)
what-where-lib: no-install-lib what-where-lib: no-install-lib
no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
@ -215,6 +222,7 @@ pre-no-install-lib:: install-prereq
dont-install-lib: dont-install-lib:
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib
post-no-install-lib:: post-no-install-lib::
@$(NULLCMD)
what-where-ext-comm: no-install-ext-comm what-where-ext-comm: no-install-ext-comm
no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
@ -222,6 +230,7 @@ pre-no-install-ext-comm:: install-prereq
dont-install-ext-comm: dont-install-ext-comm:
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm
post-no-install-ext-comm:: post-no-install-ext-comm::
@$(NULLCMD)
what-where-ext-arch: no-install-ext-arch what-where-ext-arch: no-install-ext-arch
no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
@ -229,6 +238,7 @@ pre-no-install-ext-arch:: install-prereq
dont-install-ext-arch: dont-install-ext-arch:
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch
post-no-install-ext-arch:: post-no-install-ext-arch::
@$(NULLCMD)
what-where-man: no-install-man what-where-man: no-install-man
no-install-man: pre-no-install-man dont-install-man post-no-install-man no-install-man: pre-no-install-man dont-install-man post-no-install-man
@ -236,12 +246,14 @@ pre-no-install-man:: install-prereq
dont-install-man: dont-install-man:
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-no-install-man:: post-no-install-man::
@$(NULLCMD)
install-doc: rdoc pre-install-doc do-install-doc post-install-doc install-doc: rdoc pre-install-doc do-install-doc post-install-doc
pre-install-doc:: install-prereq pre-install-doc:: install-prereq
do-install-doc: $(PROGRAM) do-install-doc: $(PROGRAM)
$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
post-install-doc:: post-install-doc::
@$(NULLCMD)
rdoc: $(PROGRAM) PHONY rdoc: $(PROGRAM) PHONY
@echo Generating RDoc documentation @echo Generating RDoc documentation
@ -253,6 +265,7 @@ pre-no-install-doc:: install-prereq
dont-install-doc:: dont-install-doc::
$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
post-no-install-doc:: post-no-install-doc::
@$(NULLCMD)
install-prereq: install-prereq:
@exit > $(INSTALLED_LIST) @exit > $(INSTALLED_LIST)