Skip to content

Commit

Permalink
Merges r27968 from ruby_1_9_2 into trunk.
Browse files Browse the repository at this point in the history
--
* common.mk (capi): uses a timestamp file to get rid of
  generating twice.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
yugui committed Sep 3, 2010
1 parent 9c5a56a commit 8889aef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Sun May 23 17:29:41 2010 Yuki Sonoda (Yugui) <[email protected]>

* common.mk (capi): uses a timestamp file to get rid of
generating twice.

Fri Jun 18 01:33:21 2010 Yuki Sonoda (Yugui) <[email protected]>

* enc/Makefile.in (realclean): has been missing. necessary
Expand Down
4 changes: 3 additions & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DM
GORUBY = go$(RUBY_INSTALL_NAME)
golf: $(LIBRUBY) $(GOLFOBJS) PHONY
$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
capi: Doxyfile PHONY $(PREP)
capi: doc/capi/.timestamp PHONY
doc/capi/.timestamp: Doxyfile $(PREP)
@$(MAKEDIRS) doc/capi
@$(DOXYGEN) -b
$(MINIRUBY) -e 'File.open("doc/capi/.timestamp", "w"){|f| f.puts(Time.now)}'

Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
Expand Down

0 comments on commit 8889aef

Please sign in to comment.