DoxyfileをDoxygenのバージョンにあわせて更新

diff --git a/doc_inner/Doxyfile b/doc_inner/Doxyfile
index 644c2c9..981aefc 100644 (file)
--- a/doc_inner/Doxyfile
+++ b/doc_inner/Doxyfile
@@ -1041,6 +1041,35 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
+# were built. This is equivalent to specifying the "-p" option to a clang tool,
+# such as clang-check. These options will then be passed to the parser.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------

diff --git a/doc_inner/Makefile b/doc_inner/Makefile
index e57591f..5e38a58 100644 (file)
--- a/doc_inner/Makefile
+++ b/doc_inner/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean doxygen-clean gnu_global-clean cmetrics-clean
+.PHONY: all clean doxyfile-update doxygen-clean gnu_global-clean cmetrics-clean
 
 CD := cd
 CMETRICS := cmetrics
@@ -34,7 +34,10 @@ $(DOXYGEN_DIR): $(DOXYSRCDIR)/Doxyfile ../src ../include
        $(INSTALL) -d $(DOXYGEN_DIR)
        $(CD) $(DOXYSRCDIR) && $(DOXYGEN)
 
-$(DOXYSRCDIR)/Doxyfile: Doxyfile
+doxyfile-update: Doxyfile
+       $(DOXYGEN) -u $<
+
+$(DOXYSRCDIR)/Doxyfile: doxyfile-update
        @$(CP) -vf Doxyfile $(DOXYSRCDIR)/
 
 # htagsのHTMLドキュメント作成先は、