2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9d3fe5c5b..828c39c547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 16 17:44:55 2010  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (capi): use -b option for doxygen.  It disables stdout
+	  buffering and prevents wrong reordering between stdout and stderr
+	  even when the output of "make" is redirected.
+
 Sun Aug 15 19:59:58 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
diff --git a/common.mk b/common.mk
index 967a599c51..88cb6a257f 100644
--- a/common.mk
+++ b/common.mk
@@ -150,7 +150,7 @@ golf: $(LIBRUBY) $(GOLFOBJS) PHONY
 	$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
 capi: Doxyfile PHONY $(PREP)
 	@$(MAKEDIRS) doc/capi
-	@$(DOXYGEN)
+	@$(DOXYGEN) -b
 
 Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
 	$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \