DoxygenとGNU GLOBALが連携するよう設定を変更

diff --git a/.gitignore b/.gitignore
index 0e696c4..cb89184 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
 GPATH
 GRTAGS
 GTAGS
-HTML

diff --git a/Doxyfile b/Doxyfile
index 40c7148..3b3a2b5 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -170,7 +170,7 @@ SEPARATE_MEMBER_PAGES  = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 4
 
 # This tag can be used to specify a number of aliases that acts
 # as commands in the documentation. An alias has the form "name=value".
@@ -581,7 +581,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = src include
+INPUT                  = .
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -605,7 +605,7 @@ FILE_PATTERNS          = *.c *.h
 # should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
-RECURSIVE              = NO
+RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -698,7 +698,7 @@ FILTER_SOURCE_FILES    = NO
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
@@ -737,7 +737,7 @@ REFERENCES_LINK_SOURCE = YES
 # tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
-USE_HTAGS              = NO
+USE_HTAGS              = YES
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for

diff --git a/Makefile b/Makefile
index b6a8500..b612918 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 DOXYGEN = doxygen
 GTAGS = gtags
 HTAGS = htags
-
+HTAGSFLAG = --map-file
 build:
        $(MAKE) -C src
 
@@ -12,14 +12,14 @@ check:
 doc:
        @$(MAKE) -sC doc
 
-doxygen:
+doxygen: htags
        @$(DOXYGEN)
 
 gtags:
        @$(GTAGS)
 
-htags:
-       @$(HTAGS)
+htags: gtags
+       @$(HTAGS) $(HTAGSFLAG) doc/doxygen/html/
 
 clean:
        @$(MAKE) -sC src clean