[pktools] 69/375: Merge branch 'master' of git.savannah.nongnu.org:/srv/git/pktools

[Bas Couwenberg]

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 a73f54560f68741633d728af26c1927efbe24e97
Merge: 5ada2b8 0c71d6d
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Mon Feb 25 16:20:15 2013 +0100

    Merge branch 'master' of git.savannah.nongnu.org:/srv/git/pktools

 Makefile.in                      |  83 +++++++-----
 aclocal.m4                       |  82 +++++++-----
 configure                        | 270 ++++++++++++++++++++++-----------------
 src/algorithms/ConfusionMatrix.h |   6 +-
 src/algorithms/Makefile.am       |   6 +-
 src/algorithms/Makefile.in       |  98 +++++++-------
 src/apps/Makefile.am             |   3 +-
 src/apps/Makefile.in             |  81 ++++++------
 src/apps/pkclassify_svm.cc       |  80 ++++++++----
 src/apps/pkopt_svm.cc            | 103 ++++++++++-----
 src/base/Makefile.in             |  33 +++--
 src/fileclasses/Makefile.in      |  31 +++--
 src/imageclasses/Makefile.in     |  31 +++--
 13 files changed, 541 insertions(+), 366 deletions(-)

diff --cc src/algorithms/Makefile.in
index a5e3600,063b4bc..88c2c69
--- a/src/algorithms/Makefile.in
+++ b/src/algorithms/Makefile.in
@@@ -34,9 -33,8 +33,8 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
- noinst_PROGRAMS = pktestStat$(EXEEXT)
  @USE_FANN_TRUE at am__append_1 = myfann_cpp.h
 - at USE_NLOPT_TRUE@am__append_2 = SensorModel.h OptFactory.h
 + at USE_NLOPT_TRUE@am__append_2 = OptFactory.h
  subdir = src/algorithms
  DIST_COMMON = $(am__libalgorithms_a_HEADERS_DIST) \
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@@ -84,12 -75,11 +75,11 @@@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLU
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libalgorithms_a_SOURCES) $(pktestStat_SOURCES)
- DIST_SOURCES = $(am__libalgorithms_a_SOURCES_DIST) \
- 	$(pktestStat_SOURCES)
+ SOURCES = $(libalgorithms_a_SOURCES)
+ DIST_SOURCES = $(am__libalgorithms_a_SOURCES_DIST)
  am__libalgorithms_a_HEADERS_DIST = Egcs.h Filter2d.h Filter.h \
  	StatFactory.h ConfusionMatrix.h svm.h FeatureSelector.h \
 -	myfann_cpp.h SensorModel.h OptFactory.h
 +	myfann_cpp.h OptFactory.h
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git