Mesa (master): doxygen: Fix doxygen/glapi.doxy

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


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

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

doxygen: Fix doxygen/glapi.doxy

The src/mesa/glapi folder was relocated in the below commit.
Amend the doxygen/glapi.doxy INPUT setting accordingly.

Whilst here, in addition this change also avoids a bug in the
consolidated Doxygen output caused by doxygen/glapi.doxy inadvertently
overwriting doxygen/swrast.tag via its GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

   commit 296adbd545b8efd38c9ed508166b2de2764a444b
   Author: Chia-I Wu <olv at lunarg.com>
   Date:   Mon Apr 26 12:56:44 2010 +0800

       glapi: Move to src/mapi/.

       Move glapi to src/mapi/{glapi,es1api,es2api}.

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

---

 doxygen/glapi.doxy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
index 3290f84..0e169e4 100644
--- a/doxygen/glapi.doxy
+++ b/doxygen/glapi.doxy
@@ -9,7 +9,7 @@ PROJECT_NAME           = "Mesa GL API dispatcher"
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../src/mesa/glapi/
+INPUT                  = ../src/mapi/glapi/
 FILE_PATTERNS          = *.c *.h
 RECURSIVE              = NO
 EXCLUDE                = 
@@ -46,4 +46,4 @@ TAGFILES               = main.tag=../core \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
                          vbo.tag=vbo
-GENERATE_TAGFILE       = swrast.tag
+GENERATE_TAGFILE       = glapi.tag




More information about the mesa-commit mailing list