Mesa (master): doxygen: Correct TAGFILE relative paths

Emil Velikov evelikov at kemper.freedesktop.org
Wed Apr 13 12:44:00 UTC 2016


Module: Mesa
Branch: master
Commit: 684e7a4a143a5ff021893aa4df7569328452fabe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=684e7a4a143a5ff021893aa4df7569328452fabe

Author: Rhys Kidd <rhyskidd at gmail.com>
Date:   Sat Apr  9 16:43:20 2016 -0400

doxygen: Correct TAGFILE relative paths

Per Doxygen documentation, to combine external documentation (stored in
a *.tag file) with a project the TAGFILES option should be set in the
configuration file.

  A tag file typically only contains a relative location of the
  documentation from the point where doxygen was run. So when
  you include a tag file in other project you have to specify
  where the external documentation is located in relation this
  project.

  You can do this in the configuration file by assigning the
  (relative) location to the tag files specified after the
  TAGFILES configuration option.

  If you use a relative path it should be relative with respect
  to the directory where the HTML output of your project is
  generated; so a relative path from the HTML output directory
  of a project to the HTML output of the other project that is
  linked to.

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
Acked-by: Emil Velikov <emil.velikov at collabora.com>

---

 doxygen/gbm.doxy    | 2 +-
 doxygen/glapi.doxy  | 2 +-
 doxygen/i965.doxy   | 2 +-
 doxygen/swrast.doxy | 2 +-
 doxygen/tnl.doxy    | 4 ++--
 doxygen/tnl_dd.doxy | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doxygen/gbm.doxy b/doxygen/gbm.doxy
index 37e4aa0..d0f7f95 100644
--- a/doxygen/gbm.doxy
+++ b/doxygen/gbm.doxy
@@ -44,5 +44,5 @@ TAGFILES               = main.tag=../core \
                          tnl_dd.tag=../tnl_dd \
                          swrast_setup.tag=../gbm_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=vbo
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = gbm.tag
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 0e169e4..d4d967a 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -45,5 +45,5 @@ TAGFILES               = main.tag=../core \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=vbo
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = glapi.tag
diff --git a/doxygen/i965.doxy b/doxygen/i965.doxy
index a3aa2b6..014245e 100644
--- a/doxygen/i965.doxy
+++ b/doxygen/i965.doxy
@@ -46,5 +46,5 @@ TAGFILES               = glsl.tag=../glsl \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
                          tnl_dd.tag=../tnl_dd \
-                         vbo.tag=vbo
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = i965.tag
diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy
index fa07afd..520764f 100644
--- a/doxygen/swrast.doxy
+++ b/doxygen/swrast.doxy
@@ -44,5 +44,5 @@ TAGFILES               = main.tag=../core \
                          tnl_dd.tag=../tnl_dd \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=vbo
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = swrast.tag
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index 85ef56c..09f5c1c 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -44,6 +44,6 @@ TAGFILES               = tnl_dd.tag=../tnl \
                          main.tag=../core \
                          math.tag=../math \
                          swrast.tag=../swrast \
-                         swrast_setup.tag=swrast_setup \
-                         vbo.tag=vbo
+                         swrast_setup.tag=../swrast_setup \
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = tnl.tag
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index 5404f37..d8fed0a 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -44,5 +44,5 @@ TAGFILES               = main.tag=../core \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=vbo
+                         vbo.tag=../vbo
 GENERATE_TAGFILE       = tnl_dd.tag




More information about the mesa-commit mailing list