This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 3bb951b73ef93b30171bbc1906b08d75ef4c7511
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Wed Jan 8 11:38:31 2014 +0100
added footer for Google analytics
---
Doxyfile | 4 +-
configure.ac | 3 +-
doc/footer.html | 33 ++++++++++++++++
doc/mainpage.dox | 114 +++++++++++++++++++++++++++++++++++++++++++++----------
4 files changed, 130 insertions(+), 24 deletions(-)
diff --git a/Doxyfile b/Doxyfile
index d078c40..86e25b9 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -343,7 +343,7 @@ TYPEDEF_HIDES_STRUCT = NO
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols.
-SYMBOL_CACHE_SIZE = 0
+#SYMBOL_CACHE_SIZE = 0
# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
@@ -910,7 +910,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER = doc/footer.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
diff --git a/configure.ac b/configure.ac
index 9167885..5d86766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
AC_INIT([pktools], [2.5], [kempe...@gmail.com])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+#AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Wno-extra-portability foreign])
AC_CONFIG_MACRO_DIR([m4])
AX_LIB_GDAL()
diff --git a/doc/footer.html b/doc/footer.html
new file mode 100644
index 0000000..98baf06
--- /dev/null
+++ b/doc/footer.html
@@ -0,0 +1,33 @@
+<!-- HTML footer for doxygen 1.8.4-->
+<!-- start footer part -->
+<!--BEGIN GENERATE_TREEVIEW-->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+ <ul>
+ $navpath
+ <li class="footer">$generatedby
+ <a href="http://www.doxygen.org/index.html";>
+ <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a>
$doxygenversion </li>
+ </ul>
+</div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer"/><address class="footer"><small>
+$generatedby  <a href="http://www.doxygen.org/index.html";>
+<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+</a> $doxygenversion
+</small></address>
+<!--END !GENERATE_TREEVIEW-->
+
+<script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-46952639-1', 'nongnu.org');
+ ga('send', 'pageview');
+
+</script>
+
+</body>
+</html>
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index f14cf72..7ddb513 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -57,25 +57,97 @@ sudo make install
sudo ldconfig
\endcode
-Prerequisites (required)
-------------------------
+\subsection pktools_installation_required Required packages (required)
+
packages to install before pktools
- - g++ (via repository)
- - make (via repository)
- - libgdal-dev http://trac.osgeo.org/gdal/wiki/BuildingOnUnix (or via
repository)
- - libgsl0-dev http://www.gnu.org/software/gsl/ (or via repository)
- - libarmadillo-dev (http://arma.sourceforge.net/download.html or via
repository)
-
-Prerequisites (optional)
-------------------------
-if configured with `--enable-nlopt`: required for \ref pkopt_svm
- - nlopt
http://ab-initio.mit.edu/wiki/index.php/NLopt#Download_and_installation
-
-if configured with `--enable-las`: required for \ref pklas2img
- - cmake (2.8.1+) http://www.cmake.org/ (or via repository)
- - libboost-dev (1.38.0+) http://www.boost.org/ (or via repository)
- - liblas http://www.liblas.org/compilation.html#compilation
- (notice this is not the same package as laslib...)
-
-if configured with `--enable-fann`: required for \ref pkclassify_nn, \ref
pkfs_nn, \ref pkfs_nn
- - libfann-dev http://leenissen.dk/fann/wp/download/ (or via repository)
+ - g++
+ - make
+ - libgdal-dev (see also http://trac.osgeo.org/gdal/wiki/BuildingOnUnix)
+ - libgsl0-dev (see also http://www.gnu.org/software/gsl/)
+ - libarmadillo-dev (see also http://arma.sourceforge.net/download.html)
+
+ Example on how to install required packages in Debian based system (using
apt-get):
+ - sudo apt-get install g++ make libgdal-dev libgsl0-dev libarmadillo-dev
+
+\subsection pktools_installation_optional Optional packages
+
+<b>To enable program \ref pkopt_svm</b>
+
+ Install additional package
+
+ - libnlopt-dev (see also
http://ab-initio.mit.edu/wiki/index.php/NLopt#Download_and_installation )
+
+ Example on how to install required packages in Debian based system (using
apt-get):
+
+ \code
+ sudo apt-get install libnlopt-dev
+ \endcode
+
+ - Install pktools with with extra configuration option --enable-nlopt:
+
+ \code
+ ./configure --enable-nlopt
+ make
+ sudo make install
+ sudo ldconfig
+ \endcode
+
+
+<b>To enable programs \ref pkclassify_nn and \ref pkfs_nn</b>
+
+ Install package
+
+ - libfann-dev (see also http://leenissen.dk/fann/wp/download/)
+
+ Example on how to install required packages in Debian based system (using
apt-get):
+
+ \code
+ sudo apt-get install libfann-dev
+ \endcode
+
+ Install pktools with extra configuration option --libfann-dev:
+
+ \code
+ ./configure --libfann-dev
+ make
+ sudo make install
+ sudo ldconfig
+ \endcode
+
+<b>To enable program \ref pklas2img</b>
+
+ Install additional packages:
+
+ - libboost-dev (see also http://www.boost.org/)
+ - liblas1 (from Mateusz Loskot, see also
http://www.liblas.org/tutorial/cpp.html)
+ - liblas-dev
+ - python-liblas
+ - liblas2
+ - liblas-c2
+ - liblas-c-dev
+
+ Example on how to install required packages in Debian based system (using
apt-get):
+
+ - first add the following two lines to /etc/apt/sources.list (replace
<codename> with what you get from lsb_release -c)
+
+ \code
+ deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu
<codename> main
+ deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu
<codename> main
+ \endcode
+
+ - then instal extra packages:
+
+ \code
+ sudo apt-get install libboost-dev liblas-dev liblas-c-dev liblas1
liblas2 liblas-c2 python-liblas
+ \endcode
+
+ Or install manually as explained in
http://www.liblas.org/compilation.html#using-unix-makefiles-on-linux
+
+ - Install pktools with with extra configuration option --enable-las:
+
+ \code
+ ./configure --enable-las
+ make
+ sudo make install
+ sudo ldconfig
+ \endcode
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
