From kde-commits  Sun Feb 13 12:22:42 2011
From: =?utf-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky () gmail ! com>
Date: Sun, 13 Feb 2011 12:22:42 +0000
To: kde-commits
Subject: kdesupport/taglib
Message-Id: <20110213122242.C4E7DAC8D0 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129759978912507

SVN commit 1220238 by lalinsky:

Move docs building to CMake

 M  +4 -0      CMakeLists.txt  
 A             Doxyfile.cmake   doc/taglib.doxygen#1220235
 M  +1 -1      doc/README  
 M  +1 -1      doc/api-header.html  
 D             doc/taglib.doxygen  
 M  +3 -6      taglib/toolkit/taglib.h  


--- trunk/kdesupport/taglib/CMakeLists.txt #1220237:1220238
@@ -75,3 +75,7 @@
 endif(NOT WIN32)
 
 INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
+ADD_CUSTOM_TARGET(docs doxygen)
+
--- trunk/kdesupport/taglib/doc/README #1220237:1220238
@@ -1 +1 @@
-Run "doxygen taglib.doxgen" to generate the TagLib API documentation.
+Run "make docs" in the parent directory to generate the TagLib API documentation.
--- trunk/kdesupport/taglib/doc/api-header.html #1220237:1220238
@@ -17,7 +17,7 @@
             <td>
               <div id="intro">
                 <table border="0" height="119" cellpadding="0" cellspacing="0" width="100%">
-                    <tr><td valign="top"><h1>TagLib 1.6.3 ($title)</h1></td></tr>
+                    <tr><td valign="top"><h1>TagLib $projectnumber ($title)</h1></td></tr>
                     <tr>
                       <td valign="bottom">
                         <div id="links">
--- trunk/kdesupport/taglib/taglib/toolkit/taglib.h #1220237:1220238
@@ -134,13 +134,10 @@
  * Please see the <a href="http://developer.kde.org/~wheeler/taglib.html">TagLib website</a> for the latest
  * downloads.
  *
- * Instructions for installing TagLib vary per platform, but generally speaking on UNIX standard configure and
- * make commands are provided.  TagLib installs a taglib-config and package-config file to make it easier to
- * integrate into various build systems.  Note that TagLib's include install directory \e must be included in
- * the header include path.  Simply adding <taglib/tag.h> will \e not work.
+ * TagLib can be built using the CMake build system. TagLib installs a taglib-config and pkg-config file to
+ * make it easier to integrate into various build systems.  Note that TagLib's include install directory \e must
+ * be included in the header include path. Simply adding <taglib/tag.h> will \e not work.
  *
- * On Windows, TagLib can be built using the CMake build systems.
- *
  * \section start Getting Started
  *
  * TagLib provides both simple, abstract APIs which make it possible to ignore the differences between tagging