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 f42a103ef881e900e13445e8298991c2a5eb488d
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Thu Sep 11 21:07:28 2014 +0000
explicit libgsl in src/apps/Makefile.am
---
src/apps/Makefile.am | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
index d2d7bba..0e130df 100644
--- a/src/apps/Makefile.am
+++ b/src/apps/Makefile.am
@@ -15,10 +15,10 @@ if USE_FANN
bin_PROGRAMS += pkann pkfsann pkregann
pkann_SOURCES = $(top_srcdir)/src/algorithms/myfann_cpp.h pkann.cc
pkann_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(FANN_CFLAGS)
-I$(top_srcdir)/src/algorithms $(AM_CXXFLAGS)
-pkann_LDADD = $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS)
+pkann_LDADD = $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS) -lgsl
pkfsann_SOURCES = $(top_srcdir)/src/algorithms/myfann_cpp.h
$(top_srcdir)/src/algorithms/CostFactory.h pkfsann.h pkfsann.cc
pkfsann_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(FANN_CFLAGS)
-I$(top_srcdir)/src/algorithms $(AM_CXXFLAGS)
-pkfsann_LDADD = $(GSL_LIBS) $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS)
-lalgorithms
+pkfsann_LDADD = $(GSL_LIBS) $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS)
-lalgorithms -lgsl
pkregann_SOURCES = $(top_srcdir)/src/algorithms/myfann_cpp.h pkregann.cc
pkregann_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base
$(FANN_CFLAGS) -I$(top_srcdir)/src/algorithms $(AM_CXXFLAGS)
pkregann_LDADD = $(GSL_LIBS) $(FANN_LIBS) $(FANN_CFLAGS) $(AM_LDFLAGS)
@@ -32,13 +32,16 @@ endif
if USE_NLOPT
bin_PROGRAMS += pkoptsvm
pkoptsvm_SOURCES = $(top_srcdir)/src/algorithms/OptFactory.h
$(top_srcdir)/src/algorithms/CostFactorySVM.h pkoptsvm.cc
-pkoptsvm_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) -lnlopt
+pkoptsvm_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) -lnlopt -lgsl
endif
# list of sources for the binaries
pkinfo_SOURCES = pkinfo.cc
+pkinfo_LDADD = -lgsl
pkcrop_SOURCES = pkcrop.cc
+pkcrop_LDADD = -lgsl
pkreclass_SOURCES = pkreclass.cc
pkdiff_SOURCES = pkdiff.cc
+pkdiff_LDADD = -lgsl
pkgetmask_SOURCES = pkgetmask.cc
pksetmask_SOURCES = pksetmask.cc
pkcreatect_SOURCES = pkcreatect.cc
@@ -46,28 +49,32 @@ pkdumpimg_SOURCES = pkdumpimg.cc
pkdumpogr_SOURCES = pkdumpogr.h pkdumpogr.cc
pksieve_SOURCES = pksieve.cc
pkstatascii_SOURCES = $(top_srcdir)/src/algorithms/StatFactory.h pkstatascii.cc
-pkstatascii_LDADD = $(GSL_LIBS) $(AM_LDFLAGS)
+pkstatascii_LDADD = -lgsl -lgslcblas $(GSL_LIBS) $(AM_LDFLAGS)
pkstatogr_SOURCES = pkstatogr.cc
+pkstatogr_LDADD = -lgsl
pkegcs_SOURCES = pkegcs.cc
-pkegcs_LDADD = -lgdal $(AM_LDFLAGS) -lgdal
+pkegcs_LDADD = $(AM_LDFLAGS) -lgsl -lgdal
pkextract_SOURCES = pkextract.cc
pkfillnodata_SOURCES = pkfillnodata.cc
pkfilter_SOURCES = pkfilter.cc
pkfilter_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) -lgsl -lgdal
pkkalman_SOURCES = pkkalman.cc $(top_srcdir)/src/algorithms/ImgRegression.h
$(top_srcdir)/src/algorithms/ImgRegression.cc
-pkkalman_LDADD = -lalgorithms $(GSL_LIBS) $(AM_LDFLAGS) -lalgorithms
+pkkalman_LDADD = -lalgorithms -lgsl $(GSL_LIBS) $(AM_LDFLAGS) -lalgorithms
pkfilterdem_SOURCES = pkfilterdem.cc
+pkfilterdem_LDADD = -lgsl
pkenhance_SOURCES = pkenhance.cc
pkenhance_LDADD = $(AM_LDFLAGS) -lgdal
pkfilterascii_SOURCES = pkfilterascii.cc
pkfilterascii_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) -lgsl -lgdal
pkdsm2shadow_SOURCES = pkdsm2shadow.cc
+pkdsm2shadow_LDADD = -lgsl
pkcomposite_SOURCES = pkcomposite.cc
pkndvi_SOURCES = pkndvi.cc
pkpolygonize_SOURCES = pkpolygonize.cc
pksvm_SOURCES = $(top_srcdir)/src/algorithms/svm.h
$(top_srcdir)/src/algorithms/svm.cpp pksvm.cc
+pksvm_LDADD = -lgsl
pkfssvm_SOURCES = $(top_srcdir)/src/algorithms/svm.h
$(top_srcdir)/src/algorithms/FeatureSelector.h
$(top_srcdir)/src/algorithms/CostFactorySVM.h
$(top_srcdir)/src/algorithms/svm.cpp pkfssvm.cc
-pkfssvm_LDADD = $(GSL_LIBS) $(AM_LDFLAGS) -lalgorithms
+pkfssvm_LDADD = -lgsl $(GSL_LIBS) $(AM_LDFLAGS) -lalgorithms
pkascii2img_SOURCES = pkascii2img.cc
pkascii2ogr_SOURCES = pkascii2ogr.cc
pkeditogr_SOURCES = pkeditogr.cc
--
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
