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 697d4edfb76e7faaecac3ad6d7ffadface40cbd2 Author: Pieter Kempeneers <kempe...@gmail.com> Date: Thu Apr 25 15:20:50 2013 +0200 corrected pksensormodel.cc: include SensorModel.h in models and not in algorithms --- doc/mainpage.dox | 1 + src/apps/Makefile.am | 3 ++- src/apps/pksensormodel.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/mainpage.dox b/doc/mainpage.dox index ef459d4..43607a9 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -59,6 +59,7 @@ Prerequisites (required) packages to install before pktool - libgdal-dev http://trac.osgeo.org/gdal/wiki/BuildingOnUnix (or via repository) - libgsl0-dev http://www.gnu.org/software/gsl/ (or via repository) + - gslwrap http://sourceforge.net/projects/gslwrap/ (will be replaced with Armadillo eventually...) Prerequisites (optional) ------------------------ diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am index 73103f0..b64c749 100644 --- a/src/apps/Makefile.am +++ b/src/apps/Makefile.am @@ -45,7 +45,8 @@ pkdumpimg_SOURCES = pkdumpimg.cc pkdumpogr_SOURCES = pkdumpogr.h pkdumpogr.cc pksieve_SOURCES = pksieve.cc pkstat_SOURCES = $(top_srcdir)/src/algorithms/StatFactory.h pkstat.cc -pkstat_LDADD = -llas $(GSL_LIBS) $(AM_LDFLAGS) +pkstat_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) +#pkstat_LDADD = -llas $(GSL_LIBS) $(AM_LDFLAGS) pkstatogr_SOURCES = pkstatogr.cc pkegcs_SOURCES = pkegcs.cc pkegcs_LDADD = -lgdal $(AM_LDFLAGS) -lgdal diff --git a/src/apps/pksensormodel.h b/src/apps/pksensormodel.h index a9d7e8c..fd13ecb 100644 --- a/src/apps/pksensormodel.h +++ b/src/apps/pksensormodel.h @@ -21,7 +21,7 @@ along with pktools. If not, see <http://www.gnu.org/licenses/>. #define _PKSENSORMODEL_H_ #include <vector> #include <gslwrap/matrix_double.h> -#include "algorithms/SensorModel.h" +#include "models/SensorModel.h" double objFunction(const std::vector<double> &x, std::vector<double> &grad, void *my_func_data); -- 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